Bill Yi
dfcee4113b
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 am: 236da59677 -s ours am: 94c6fa964f -s ours am: d8749970e3 -s ours
...
am: 07a4d16c1f
2018-11-10 18:26:04 -08:00
Bill Yi
07a4d16c1f
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 am: 236da59677 -s ours am: 94c6fa964f -s ours
...
am: d8749970e3
2018-11-10 18:10:56 -08:00
Bill Yi
bf64f41035
[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 am: 09f4f73afa -s ours am: 5c7f0c40fb -s ours am: e138bd2c05 -s ours
...
am: 7eeb8b0b3f
2018-11-10 17:59:54 -08:00
Bill Yi
d8749970e3
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 am: 236da59677 -s ours
...
am: 94c6fa964f
2018-11-10 17:54:44 -08:00
Bill Yi
7eeb8b0b3f
[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 am: 09f4f73afa -s ours am: 5c7f0c40fb -s ours
...
am: e138bd2c05
2018-11-10 17:50:47 -08:00
Bill Yi
94c6fa964f
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
...
am: 236da59677
2018-11-10 17:46:47 -08:00
Bill Yi
e138bd2c05
[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 am: 09f4f73afa -s ours
...
am: 5c7f0c40fb
2018-11-10 17:44:42 -08:00
Bill Yi
5c7f0c40fb
[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903
...
am: 09f4f73afa
2018-11-10 17:35:57 -08:00
Android Build Merger (Role)
09f4f73afa
[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903
...
Change-Id: I80379f2416b5f60734fce3db6b8d74ceca628331
2018-11-10 19:40:53 +00:00
Android Build Merger (Role)
7176023903
[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2
...
Change-Id: I17330d6b3d4cf62d89a3413605ceae1b701bb858
2018-11-10 19:40:44 +00:00
Bill Yi
5739e3bfb2
Import translations. DO NOT MERGE
...
Change-Id: Ib25ad353f0684aebfd2817cabd5abea5a63d970f
Auto-generated-cl: translation import
2018-11-10 11:40:18 -08:00
Android Build Merger (Role)
236da59677
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
...
Change-Id: I71ed720b5ec39dc9be62aa13d71f5d06f3bec0e3
2018-11-10 18:43:44 +00:00
Android Build Merger (Role)
84b233fab0
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57
...
Change-Id: I997246032f47b236724ae93f3fe4e0ba34053d66
2018-11-10 18:43:37 +00:00
Bill Yi
eadf247a57
Import translations. DO NOT MERGE
...
Change-Id: Icda106c2509ee7cfe135a526ddc6b1da312e0d00
Auto-generated-cl: translation import
2018-11-10 10:43:10 -08:00
Wang, ArvinX
0740d13e03
Merge "Unable to input PIN with hardware keyboard" am: b8740842e0
...
am: 7e4d381a48
2018-11-09 17:49:27 -08:00
Wang, ArvinX
7e4d381a48
Merge "Unable to input PIN with hardware keyboard"
...
am: b8740842e0
2018-11-09 16:58:25 -08:00
Treehugger Robot
b8740842e0
Merge "Unable to input PIN with hardware keyboard"
2018-11-10 00:05:38 +00:00
Brad Ebinger
30858dc7ac
Merge "Expose SRVCC state changes as @SystemAPI" am: c10b96899e
...
am: 657343b811
2018-11-09 15:27:27 -08:00
Brad Ebinger
657343b811
Merge "Expose SRVCC state changes as @SystemAPI"
...
am: c10b96899e
2018-11-09 15:16:15 -08:00
Brad Ebinger
c10b96899e
Merge "Expose SRVCC state changes as @SystemAPI"
2018-11-09 23:02:38 +00:00
Android Build Merger (Role)
c8e008b0b4
Merge "Merge "Introduce getRssi() in CellSignalStrengthLte" am: 5bdf255e0d am: e819bd7a1e" into pi-dev-plus-aosp
2018-11-09 22:48:04 +00:00
Shuo Qian
61db02b01a
Merge "Introduce getRssi() in CellSignalStrengthLte" am: 5bdf255e0d
...
am: e819bd7a1e
2018-11-09 14:47:08 -08:00
Tej Singh
6752e11cdc
Merge "Thermal shutdown fix: cool down on writing to disk" into pi-dev
...
am: 0cc63ef090
2018-11-09 14:41:26 -08:00
Shuo Qian
e819bd7a1e
Merge "Introduce getRssi() in CellSignalStrengthLte"
...
am: 5bdf255e0d
2018-11-09 14:21:37 -08:00
Shuo Qian
5bdf255e0d
Merge "Introduce getRssi() in CellSignalStrengthLte"
2018-11-09 22:07:50 +00:00
TreeHugger Robot
0cc63ef090
Merge "Thermal shutdown fix: cool down on writing to disk" into pi-dev
2018-11-09 21:59:32 +00:00
Jong Wook Kim
358ff5d2bf
Merge "Add WIFI_ENABLED and WIFI_DISABLED to StaEvent" into pi-dev
...
am: f3375f360e
2018-11-09 13:40:25 -08:00
Jong Wook Kim
f3375f360e
Merge "Add WIFI_ENABLED and WIFI_DISABLED to StaEvent" into pi-dev
2018-11-09 21:16:38 +00:00
Robert Carr
e840014762
Merge "DO NOT MERGE Make stop complete notification call in to ActivityManager blocking." into pi-dev
...
am: b71d950932
2018-11-09 13:12:13 -08:00
Tejinder Singh
ba7af6259d
Merge "Pixel Thermal Throttling: fix throttling constants." into pi-dev
...
am: 3ebd957c25
2018-11-09 13:06:33 -08:00
TreeHugger Robot
b71d950932
Merge "DO NOT MERGE Make stop complete notification call in to ActivityManager blocking." into pi-dev
2018-11-09 20:45:57 +00:00
Chenbo Feng
d7a976a55c
Merge "Rename android bpf library" am: cfcb33cb32
...
am: 0ba8701f5c
2018-11-09 12:40:46 -08:00
TreeHugger Robot
3ebd957c25
Merge "Pixel Thermal Throttling: fix throttling constants." into pi-dev
2018-11-09 20:38:55 +00:00
Tej Singh
42f9e06418
Thermal shutdown fix: cool down on writing to disk
...
Currently, statsd uses wall clock seconds to write data to disk. This
issue affects both thermal and normal shutdowns, because if two writes
occur in the same second, the more recent write will overwrite the older
write, erasing the actual data that we want.
For thermal shutdowns, we write twice. Once because of termination
signal received, and once because of binder death recipient from
statscompanion service.
For normal clean shutdowns, we write 3 times. In addition to the two
above, we write for the shutdown received signal.
This fix introduces a cool down period of 3 seconds between writing to
disk.
Bug: 112432890
Test: statsd unit tests
Test: statsd cts tests
Test: manually verified normal shutdown had 1 file written to disk
Test: manually verified thermal shutdown had 1 file written to disk
Change-Id: I4cd39de9063935e762ff7d00051ccc915f31e89a
2018-11-09 20:37:42 +00:00
Chenbo Feng
0ba8701f5c
Merge "Rename android bpf library"
...
am: cfcb33cb32
2018-11-09 12:26:25 -08:00
Treehugger Robot
cfcb33cb32
Merge "Rename android bpf library"
2018-11-09 20:06:41 +00:00
Todd Kennedy
aefe6b57a8
[automerger skipped] Merge "Revert "Fix the icon overlay after density change"" into pi-dev
...
am: e59ce289b7
2018-11-09 11:19:01 -08:00
Todd Kennedy
e59ce289b7
Merge "Revert "Fix the icon overlay after density change"" into pi-dev
2018-11-09 18:39:52 +00:00
Todd Kennedy
2d80eb4425
Merge "Revert "resolve merge conflicts of 0cc0d229d0 to pi-dev-plus-aosp"" into pi-dev-plus-aosp
2018-11-09 18:39:28 +00:00
Todd Kennedy
166363d897
Revert "Fix the icon overlay after density change"
...
This reverts commit 252efd708a
2018-11-09 18:38:17 +00:00
Todd Kennedy
b2f48af230
Revert "resolve merge conflicts of 0cc0d229d0 to pi-dev-plus-aosp"
...
This reverts commit 6fa357a529
2018-11-09 18:38:07 +00:00
Selim Cinek
7a6f5c4b01
Merge "resolve merge conflicts of 0cc0d229d0 to pi-dev-plus-aosp" into pi-dev-plus-aosp
2018-11-09 17:30:28 +00:00
Felka Chang
6fa357a529
resolve merge conflicts of 0cc0d229d0 to pi-dev-plus-aosp
...
To add test testHeaderReadFromOldController into
HeadsUpAppearanceControllerTest.java and conflict with
testOperatorNameViewUpdated.
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If7d7961dbc12346484f3d139bdc808a53abc6c46
2018-11-09 17:29:40 +00:00
Calvin Pan
41ad850c96
Merge "Add CarrierId column in TelephonyProvider" am: 1df5ca6a71
...
am: dfed97ba6d
2018-11-09 06:02:41 -08:00
Paul Duffin
f82d01d16f
Merge "Remove android.icu.... classes from light grey list" am: c6b17ad431
...
am: 1519c387e7
2018-11-09 05:51:34 -08:00
Calvin Pan
dfed97ba6d
Merge "Add CarrierId column in TelephonyProvider"
...
am: 1df5ca6a71
2018-11-09 05:49:05 -08:00
Paul Duffin
1519c387e7
Merge "Remove android.icu.... classes from light grey list"
...
am: c6b17ad431
2018-11-09 05:40:42 -08:00
Calvin Pan
1df5ca6a71
Merge "Add CarrierId column in TelephonyProvider"
2018-11-09 13:30:51 +00:00
Paul Duffin
c6b17ad431
Merge "Remove android.icu.... classes from light grey list"
2018-11-09 13:24:17 +00:00
Alan Stokes
0a0559c0ce
Merge "DexLoadReporter needs to handle arbitrary class loaders." am: f2d5ace011
...
am: 1e29264790
2018-11-09 03:20:40 -08:00
