Bertrand Simonnet
e86186bbbe
Merge "metricsd: Don\'t upload if product id is empty." am: 0ba2606444 am: f826969e10
...
am: 1230b49350
* commit '1230b4935072b31f0321b071a7e1f9f87fac495b':
metricsd: Don't upload if product id is empty.
2015-11-18 19:17:32 +00:00
Junichi Uekawa
13c8e8d8ac
Merge "Fix non-vendor.img configuration." am: 1337349ea1 am: ef7197eefa
...
am: 1aa74e687e
* commit '1aa74e687ecdd2bef8fb786d8027512b6953b6ad':
Fix non-vendor.img configuration.
2015-11-18 17:52:39 +00:00
Elliott Hughes
9a373a160c
Merge "Pass screen to the device." am: c40f213b67 am: 1fd0ea9e0e
...
am: cc1ef0afae
* commit 'cc1ef0afae0ebbd818232e0252454d5591847f85':
Pass $TERM to the device.
2015-11-18 00:25:05 +00:00
David Pursell
4edfc3f1cb
Merge "fastboot: create Transport object (take 2)." am: 7a75f4e3a5 am: 9c4f9392e1
...
am: 951d1f06c6
* commit '951d1f06c64ea62f59319869cc21b17e12e67717':
fastboot: create Transport object (take 2).
2015-11-18 00:24:22 +00:00
Bertrand Simonnet
400c8e455e
Merge "metricsd: Remove dead code." am: 695da48944 am: a3e097c9ca
...
am: 078ea36c4f
* commit '078ea36c4f45b5ec46273f06ce6a1a670f136f14':
metricsd: Remove dead code.
2015-11-18 00:23:17 +00:00
Mark Salyzyn
5fbb71515d
Merge "Revert "liblog: resolve deadlocks"" am: e6cf1c6372 am: 52b9f02076
...
am: f3c3bf5dfb
* commit 'f3c3bf5dfbd4fe666c6152a5a8030c1fbe95e73b':
Revert "liblog: resolve deadlocks"
2015-11-18 00:22:33 +00:00
Calin Juravle
6426874cdd
Merge "Don\'t create profiles directory under dalvik-cache." am: 942f8ea84f am: 2a095e186b
...
am: cdef6fb917
* commit 'cdef6fb91725f771ab23d0eea03a97aa3c161d75':
Don't create profiles directory under dalvik-cache.
2015-11-18 00:20:51 +00:00
Bertrand Simonnet
1230b49350
Merge "metricsd: Don\'t upload if product id is empty." am: 0ba2606444
...
am: f826969e10
* commit 'f826969e1035d289d451f2151eb5578610317d3d':
metricsd: Don't upload if product id is empty.
2015-11-17 22:28:10 +00:00
Bertrand Simonnet
f826969e10
Merge "metricsd: Don\'t upload if product id is empty."
...
am: 0ba2606444
* commit '0ba260644440f51cd5e1d8db10bebf4c041ec7e7':
metricsd: Don't upload if product id is empty.
2015-11-17 22:22:39 +00:00
Bertrand Simonnet
0ba2606444
Merge "metricsd: Don't upload if product id is empty."
2015-11-17 21:51:21 +00:00
Bertrand SIMONNET
1d15d46e17
metricsd: Don't upload if product id is empty.
...
If the product id is not set, the product_id file might exist but be
empty. In this case, to try to update the metrics.
Bug: 25745391
Change-Id: I3942afaf38921b44ddb7e5a29d5d0e4fb6d48d94
Test: Unit tests.
2015-11-17 13:22:30 -08:00
Junichi Uekawa
1aa74e687e
Merge "Fix non-vendor.img configuration." am: 1337349ea1
...
am: ef7197eefa
* commit 'ef7197eefa2d000b0e446cf1fb223a55746ae2c3':
Fix non-vendor.img configuration.
2015-11-17 03:40:24 +00:00
Junichi Uekawa
ef7197eefa
Merge "Fix non-vendor.img configuration."
...
am: 1337349ea1
* commit '1337349ea11a6bb5c44ba5c5bb064c750bd626c5':
Fix non-vendor.img configuration.
2015-11-17 03:36:23 +00:00
Junichi Uekawa
1337349ea1
Merge "Fix non-vendor.img configuration."
2015-11-17 03:29:37 +00:00
Daniel Rosenberg
881671ae84
Fix fastboot to not add \'-\' before suffix
...
am: b10978e5cd
* commit 'b10978e5cdd7148f1beb63706e0369d070443355':
Fix fastboot to not add '-' before suffix
2015-11-17 03:28:40 +00:00
Mark Salyzyn
32789a8f32
logd: klogd: parse error
...
am: ddb842ac93
* commit 'ddb842ac9342438aae65f8aaf8ce66fb41ca65a1':
logd: klogd: parse error
2015-11-17 03:28:33 +00:00
Elliott Hughes
f3a3d89abe
Cope with angler\'s whitespace-padded partition size reporting.
...
am: 5e942fea31
* commit '5e942fea311902818c14576f5aaaed71bf1d3fe0':
Cope with angler's whitespace-padded partition size reporting.
2015-11-17 03:28:26 +00:00
Daniel Rosenberg
9cca3e585b
Update fastboot help command with long options
...
am: 2812011cfb
* commit '2812011cfb47033dca376476091dfa8d724298ba':
Update fastboot help command with long options
2015-11-17 03:28:19 +00:00
Daniel Rosenberg
74ef16ad1b
Changed set_active to be a flag
...
am: 9ef4d91267 -s ours
* commit '9ef4d912674e194b04c58c5c563ee76dfdae45de':
Changed set_active to be a flag
2015-11-17 03:28:12 +00:00
Daniel Rosenberg
5714992ca4
Fix fastboot variable name
...
am: 0ef4e444a7
* commit '0ef4e444a73aae92b1174b78bffbcecf8c99a199':
Fix fastboot variable name
2015-11-17 03:23:56 +00:00
Badhri Jagan Sridharan
83cdf6b8dd
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/system/core
2015-11-17 03:23:51 +00:00
Badhri Jagan Sridharan
9e2f2d7863
healthd: Read the max power supply voltage
...
am: c911044ff8
* commit 'c911044ff8771fbfa0736d5cfe850d9e32bf1b1b':
healthd: Read the max power supply voltage
2015-11-17 03:23:48 +00:00
Badhri Jagan Sridharan
59c044057b
healthd: Read the max power supply voltage
...
am: c911044ff8
* commit 'c911044ff8771fbfa0736d5cfe850d9e32bf1b1b':
healthd: Read the max power supply voltage
2015-11-17 03:23:43 +00:00
Rom Lemarchand
7dbf81c70c
init: skip "name" DT entry
...
am: d2bbe45713
* commit 'd2bbe457135fc1dad239eb840e31b7f6640eab8b':
init: skip "name" DT entry
2015-11-17 03:23:35 +00:00
Daniel Rosenberg
06acfa9359
Fastboot changes to support A/B partitioning
...
am: b4354b3615 -s ours
* commit 'b4354b3615a70cdb5612ef5f8a12c466a939cb0b':
Fastboot changes to support A/B partitioning
2015-11-17 03:23:27 +00:00
Elliott Hughes
53483aa234
Sync with master fastboot.
...
am: 98699eca48 -s ours
* commit '98699eca48a72f18dcdc551b44a929d00c3d400e':
Sync with master fastboot.
2015-11-17 03:19:10 +00:00
Mark Salyzyn
07e1bd87e8
liblog: logd: support logd.timestamp = monotonic
...
am: c48d249c37
* commit 'c48d249c37527b062768c757c3b6a8c6a757ce2b':
liblog: logd: support logd.timestamp = monotonic
2015-11-17 03:14:51 +00:00
Mark Salyzyn
ab12c99b0d
logd: Add support for *.logd.filter
...
am: 21c7686996 -s ours
* commit '21c76869960a1240b6161316a2984b6f3cb6e069':
logd: Add support for *.logd.filter
2015-11-17 03:14:43 +00:00
Mark Salyzyn
ae8d5805a8
logd: statistics report chatty effective percentage
...
am: e9252451bd
* commit 'e9252451bdfe316b40f755f06386ad1873bc68f8':
logd: statistics report chatty effective percentage
2015-11-17 03:11:30 +00:00
Mark Salyzyn
96076bfb85
liblog: add android_log_timestamp() private function
...
am: aa5abfd84e
* commit 'aa5abfd84e1fff9abe332e14bc1d28c685124dc6':
liblog: add android_log_timestamp() private function
2015-11-17 03:11:23 +00:00
Mark Salyzyn
109a92f39c
liblog: logcat: add epoch and monotonic format modifiers
...
am: 9cb92047e5 -s ours
* commit '9cb92047e5f0499fdea2c3fafedd4ff00c6b530a':
liblog: logcat: add epoch and monotonic format modifiers
2015-11-17 03:11:17 +00:00
Mark Salyzyn
c6e6e3a977
logd: correct for number of elements in prune
...
am: 13f42ec2f1
* commit '13f42ec2f1113838bf4edd8ba5b5dffa920d7324':
logd: correct for number of elements in prune
2015-11-17 03:06:37 +00:00
Mark Salyzyn
d477a64c23
logd: use coalesce instead of merge (cleanup)
...
am: 6326bb8fd2 -s ours
* commit '6326bb8fd29c2cadb4664b6c6944af8771a64e96':
logd: use coalesce instead of merge (cleanup)
2015-11-17 03:06:31 +00:00
Mark Salyzyn
ad71a6adda
logd: clearAll by UID speedup
...
am: 9bc35ef4c9
* commit '9bc35ef4c975891e2fb77745c877ce8847727b73':
logd: clearAll by UID speedup
2015-11-17 03:02:46 +00:00
Mark Salyzyn
b8e04eed74
logd: clear return and deal with busy if readers locked
...
am: 5679d8d572 -s ours
* commit '5679d8d57244ebe1daa8d992113a0721af9547ca':
logd: clear return and deal with busy if readers locked
2015-11-17 03:02:39 +00:00
Mark Salyzyn
ba7ec6ad41
logd: update region lock after entry has passed to reader socket
...
am: 70cbe025f4
* commit '70cbe025f4afbc0236346da9ede0cd56cba38a12':
logd: update region lock after entry has passed to reader socket
2015-11-17 02:58:39 +00:00
Mark Salyzyn
0c039df752
logd: clientHasLogCredentials false negatives
...
am: b04352e597
* commit 'b04352e59791b05ccab16d26e4291b53c9184d09':
logd: clientHasLogCredentials false negatives
2015-11-17 02:58:32 +00:00
Mark Salyzyn
d48a1e199b
logd: object layer format statistics
...
am: 96c45c648d -s ours
* commit '96c45c648dc2d445bfed7677b22d92817316b081':
logd: object layer format statistics
2015-11-17 02:58:25 +00:00
Mark Salyzyn
d401d468d9
logd: optimize code hotspots
...
am: f9162cf711 -s ours
* commit 'f9162cf711abd55ccb1c6f9d5f4805b96471c88f':
logd: optimize code hotspots
2015-11-17 02:55:11 +00:00
Mark Salyzyn
526674966a
logd: Add LogUtils.h
...
am: e9451e7ef8 -s ours
* commit 'e9451e7ef8cc8b7d00bcb4e94b78aaa9c037693f':
logd: Add LogUtils.h
2015-11-17 02:50:37 +00:00
Mark Salyzyn
d9bea5e4bf
logd: klogd deal with nuls in dmesg
...
am: 4efc87e5eb -s ours
* commit '4efc87e5ebd7612d119cd8c09bf78b32093c258e':
logd: klogd deal with nuls in dmesg
2015-11-17 02:47:25 +00:00
Mark Salyzyn
7de5fd246a
logd: log_strtok_r deal with nuls
...
am: f9e4d0b6b5
* commit 'f9e4d0b6b5559090be599a3282273d799d3499d8':
logd: log_strtok_r deal with nuls
2015-11-17 02:39:45 +00:00
Mark Salyzyn
547f7fa692
liblog: logprint: printable nul
...
am: 26499e41ae
* commit '26499e41ae2f81798be20ee97e494900d7eceedc':
liblog: logprint: printable nul
2015-11-17 02:39:38 +00:00
Mark Salyzyn
33ce92ab60
logd: klogd: sniff for time correction on Mediatek
...
am: 3f78f93302 -s ours
* commit '3f78f93302c737b454ea63bac0bb15553b953d01':
logd: klogd: sniff for time correction on Mediatek
2015-11-17 02:39:30 +00:00
Mark Salyzyn
42a8164752
logd: klogd and Mediatek part deux
...
am: 540cfe8e6b -s ours
* commit '540cfe8e6ba6963f7d6b6407870aac197d1e27e6':
logd: klogd and Mediatek part deux
2015-11-17 02:36:16 +00:00
Mark Salyzyn
7651e1fab2
liblog: logcat: Add year and zone to date on each line
...
am: 39888aef13 -s ours
* commit '39888aef136da3334dbdd86e18b92733c7795e81':
liblog: logcat: Add year and zone to date on each line
2015-11-17 02:32:57 +00:00
Mark Salyzyn
8e8e15bb8a
logd: switch asprintf to std::string
...
am: 5c3835d943 -s ours
* commit '5c3835d9431f9b1277a110a61375231181307094':
logd: switch asprintf to std::string
2015-11-17 02:26:35 +00:00
Mark Salyzyn
36c634511e
logd: white and black switch to std::string
...
am: 8a7f778c01 -s ours
* commit '8a7f778c018fc67f6fdc7d9dca7f7ed53f7c7fdc':
logd: white and black switch to std::string
2015-11-17 02:23:17 +00:00
Junichi Uekawa
07b69961f2
Fix non-vendor.img configuration.
...
If / is not write-able and system.img contains system/vendor, symlink
for `/vendor/ -> /system/vendor/` that is otherwise done in init.rc
should be done at build time.
BUG=b:25512724
Change-Id: Iaa63d6440373a4fd754a933c9f1960b3787a6d98
2015-11-17 11:20:21 +09:00
Mark Salyzyn
6071285a57
logd: statistics switch to std::string
...
am: 2a2b0d1c6e -s ours
* commit '2a2b0d1c6ed99cbd195c72fab666546320981e61':
logd: statistics switch to std::string
2015-11-17 02:19:51 +00:00