OSDN Git Service
Bill Yi [Thu, 21 Dec 2017 20:34:39 +0000 (20:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours am:
f6c335b353 -s ours am:
f24783846d -s ours
am:
29f70cb6fb -s ours
Change-Id: I3b1f978abd9a3f0511af1df8735f873695e01997
Bill Yi [Thu, 21 Dec 2017 20:33:26 +0000 (20:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours am:
39d480e67c -s ours am:
59f4b0c11f -s ours
am:
6ba039da20 -s ours
Change-Id: I6d3cfb032e8402a6458b83213739fbf11ee78f0d
Bill Yi [Thu, 21 Dec 2017 20:31:52 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours am:
934729c535 -s ours am:
37e0c23902 -s ours
am:
b4db20359a -s ours
Change-Id: I543fbce177f9dc7cbc2448f08e00780e801aff2d
Bill Yi [Thu, 21 Dec 2017 20:30:35 +0000 (20:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours am:
f123f221db -s ours am:
95b4c706b8 -s ours
am:
5dd6a1c735 -s ours
Change-Id: I9c7854ba3ff5cac3da1e39e7fe48ba0b27a06e4a
Bill Yi [Thu, 21 Dec 2017 20:28:58 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours am:
7baaa51e62 -s ours am:
a963a02442 -s ours
am:
dfa5f5d102 -s ours
Change-Id: I14296ee29df5b968168c0e9815f96cb88972bd0a
Bill Yi [Thu, 21 Dec 2017 20:27:51 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours am:
301dfae698 -s ours am:
5f38be9fdb -s ours
am:
6868ade468 -s ours
Change-Id: I91ee1333af3dfb29d70d5929a228c91edd9ce10d
Bill Yi [Thu, 21 Dec 2017 20:26:17 +0000 (20:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours am:
25d7b576ec -s ours am:
50f7d64f05 -s ours
am:
833ba96cba -s ours
Change-Id: I38b2c9a6f75f6d38ca4e79dc204b2603de633ce1
Android Build Merger (Role) [Thu, 21 Dec 2017 20:10:29 +0000 (20:10 +0000)]
Merge "Merge "SMS over IMS APIs revision" am:
2bf7f03e63 am:
f9eba1a18f am:
ca88d359c0"
abdalkader [Thu, 21 Dec 2017 20:10:03 +0000 (20:10 +0000)]
Merge "SMS over IMS APIs revision" am:
2bf7f03e63 am:
f9eba1a18f
am:
ca88d359c0
Change-Id: Iea7624e10230294505982f0373b97a2486d6996f
Android Build Merger (Role) [Thu, 21 Dec 2017 20:06:07 +0000 (20:06 +0000)]
Merge "Merge "Add Notification Flag behavior test" am:
89bb1971d0 am:
dee5f9a738 am:
a33e1dd26f -s ours"
Yan Sun [Thu, 21 Dec 2017 20:05:39 +0000 (20:05 +0000)]
Merge "Add Notification Flag behavior test" am:
89bb1971d0 am:
dee5f9a738
am:
a33e1dd26f -s ours
Change-Id: I98caf6c319a21ebd5f85c1c740691ddcd31894ba
Android Build Merger (Role) [Thu, 21 Dec 2017 20:01:19 +0000 (20:01 +0000)]
Merge "Merge "Fix random systemui crashes during cts test DO NOT MERGE" am:
d8514e82aa -s ours am:
e9940be86d am:
cb9ded1d30 -s ours"
Chrison.chai [Thu, 21 Dec 2017 20:00:54 +0000 (20:00 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE" am:
d8514e82aa -s ours am:
e9940be86d
am:
cb9ded1d30 -s ours
Change-Id: I879999d0033e242d02c50bf6ea4a2c40a433a871
Android Build Merger (Role) [Thu, 21 Dec 2017 19:59:57 +0000 (19:59 +0000)]
Merge "Merge "Testables lib should not statically link mockito" am:
47d04fc5c0 am:
b42cd23425 am:
0a6f66e9a9 -s ours"
Philip P. Moltmann [Thu, 21 Dec 2017 19:59:29 +0000 (19:59 +0000)]
Merge "Testables lib should not statically link mockito" am:
47d04fc5c0 am:
b42cd23425
am:
0a6f66e9a9 -s ours
Change-Id: I86a59fd6006a3ba59b237044c61ab1d5c2a61333
Android Build Merger (Role) [Thu, 21 Dec 2017 19:54:55 +0000 (19:54 +0000)]
Merge "Merge "Receiving side Call handover API implementation." am:
3c7bc2dc06 am:
151c15445a am:
c65e740f98 -s ours"
Bill Yi [Thu, 21 Dec 2017 19:54:14 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours am:
f6c335b353 -s ours
am:
f24783846d -s ours
Change-Id: I47bd5497b0ac5ef061975b4ef7aed22cb016d2db
Sanket Padawe [Thu, 21 Dec 2017 19:54:03 +0000 (19:54 +0000)]
Merge "Receiving side Call handover API implementation." am:
3c7bc2dc06 am:
151c15445a
am:
c65e740f98 -s ours
Change-Id: I457622e41c15891142a51140b083d1d6b465e10e
Siddharth Ray [Thu, 21 Dec 2017 19:53:54 +0000 (19:53 +0000)]
Merge "Obtain cellular related battery statistics"
Bill Yi [Thu, 21 Dec 2017 19:52:47 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours am:
39d480e67c -s ours
am:
59f4b0c11f -s ours
Change-Id: I6c0cbf7c26fc7f2b010126e5aa7ceb444aa71ab3
Bill Yi [Thu, 21 Dec 2017 19:51:02 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours am:
934729c535 -s ours
am:
37e0c23902 -s ours
Change-Id: I2e96d32fcbb128a84828172f17b45db12ee790fd
Bill Yi [Thu, 21 Dec 2017 19:49:35 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours am:
f123f221db -s ours
am:
95b4c706b8 -s ours
Change-Id: Ia66e2c284c14aa911c92f49150ce9b8ee6c345e8
Chenbo Feng [Thu, 21 Dec 2017 19:49:25 +0000 (19:49 +0000)]
Merge "Use NetworkStatsService to get stats for apps" am:
693d8a2ab1 am:
fa7f4015fc
am:
09a81e4da1
Change-Id: I90ce68a72afbf596e28d987e925795709d24dd52
Bill Yi [Thu, 21 Dec 2017 19:47:45 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours am:
7baaa51e62 -s ours
am:
a963a02442 -s ours
Change-Id: Ife6d85d42f5f0beffdaf5da0c031e79d74d3c8d9
Bill Yi [Thu, 21 Dec 2017 19:46:22 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours am:
301dfae698 -s ours
am:
5f38be9fdb -s ours
Change-Id: I835ba14d3bed4c5ebf901d60a2603c6692135b4e
TreeHugger Robot [Thu, 21 Dec 2017 19:44:38 +0000 (19:44 +0000)]
Merge "Move ServiceListing to SettingsLib and add tests"
Bill Yi [Thu, 21 Dec 2017 19:44:05 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours am:
25d7b576ec -s ours
am:
50f7d64f05 -s ours
Change-Id: Ie2458ad57d6b64678243429e257e0701edd357a5
abdalkader [Thu, 21 Dec 2017 19:40:25 +0000 (19:40 +0000)]
Merge "SMS over IMS APIs revision" am:
2bf7f03e63
am:
f9eba1a18f
Change-Id: Ia7bdaeee0ca3942d72d9e92faa78a947fe1d4616
Yan Sun [Thu, 21 Dec 2017 19:36:32 +0000 (19:36 +0000)]
Merge "Add Notification Flag behavior test" am:
89bb1971d0
am:
dee5f9a738
Change-Id: Ib7aa75882fb1b8d3c3380ec680969abe252cbff1
Chrison.chai [Thu, 21 Dec 2017 19:32:18 +0000 (19:32 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE" am:
d8514e82aa -s ours
am:
e9940be86d
Change-Id: I77051a94b2e8694d378973c79310befca933515b
Philip P. Moltmann [Thu, 21 Dec 2017 19:28:17 +0000 (19:28 +0000)]
Merge "Testables lib should not statically link mockito" am:
47d04fc5c0
am:
b42cd23425
Change-Id: I7d7096cf24234925256895c3527f44e72cf07493
TreeHugger Robot [Thu, 21 Dec 2017 19:23:41 +0000 (19:23 +0000)]
Merge "Add TestApi to disable the TextClock clock tick."
Bill Yi [Thu, 21 Dec 2017 19:22:55 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours
am:
f6c335b353 -s ours
Change-Id: I7b218e76069fce17d24c3bc12fa28af797ee69d4
Bill Yi [Thu, 21 Dec 2017 19:20:42 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours
am:
39d480e67c -s ours
Change-Id: I521cbe71ba8abbaa04deb8e4ae232764687a29d2
abdalkader [Thu, 21 Dec 2017 19:20:36 +0000 (19:20 +0000)]
Merge "SMS over IMS APIs revision"
am:
2bf7f03e63
Change-Id: I7296426e1c1fc903d92e324a09598e357e75389b
Sanket Padawe [Thu, 21 Dec 2017 19:19:54 +0000 (19:19 +0000)]
Merge "Receiving side Call handover API implementation." am:
3c7bc2dc06
am:
151c15445a
Change-Id: Ie5c522cd1c9c3b0da254cf1fa9f1a756361a4e3f
Bill Yi [Thu, 21 Dec 2017 19:19:10 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours
am:
934729c535 -s ours
Change-Id: Id05ac1fc16e2e054febc631943424b85008d34b2
Yan Sun [Thu, 21 Dec 2017 19:17:32 +0000 (19:17 +0000)]
Merge "Add Notification Flag behavior test"
am:
89bb1971d0
Change-Id: I0948f245fee622b5acd1a1bb414e7a2e20090dc8
Bill Yi [Thu, 21 Dec 2017 19:17:16 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours
am:
f123f221db -s ours
Change-Id: Iaa7ea701db9f070098ae53d98b8e019a865bb704
Bill Yi [Thu, 21 Dec 2017 19:15:41 +0000 (19:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours
am:
7baaa51e62 -s ours
Change-Id: I6ae9f1fbaa5335f0906dc4af678226dd101c8cd2
Chenbo Feng [Thu, 21 Dec 2017 19:15:29 +0000 (19:15 +0000)]
Merge "Use NetworkStatsService to get stats for apps" am:
693d8a2ab1
am:
fa7f4015fc
Change-Id: I14f614a86214bd4f006415c48b9a8323e06c737f
Chrison.chai [Thu, 21 Dec 2017 19:14:40 +0000 (19:14 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE"
am:
d8514e82aa -s ours
Change-Id: Ib0b5affb287771dfc965ebe0a05791849aa919c8
TreeHugger Robot [Thu, 21 Dec 2017 19:14:37 +0000 (19:14 +0000)]
Merge "Using new usbhost function usb_device_get_string_ucs2() to get USB descriptor strings."
Bill Yi [Thu, 21 Dec 2017 19:13:50 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours
am:
301dfae698 -s ours
Change-Id: I47dc0cc519fd0707c83e3aab976934b3b3ce2150
Philip P. Moltmann [Thu, 21 Dec 2017 19:12:57 +0000 (19:12 +0000)]
Merge "Testables lib should not statically link mockito"
am:
47d04fc5c0
Change-Id: I4aee182a94fa62a8a254f0bbc480b4de1a4ed688
Bill Yi [Thu, 21 Dec 2017 19:12:14 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours
am:
25d7b576ec -s ours
Change-Id: Iaf6c344263bc6d3e32f0df8d14cc27327a30b3ec
Etan Cohen [Thu, 21 Dec 2017 18:47:46 +0000 (18:47 +0000)]
Merge "[AWARE] Check dynamic location permission"
Robert Berry [Thu, 21 Dec 2017 18:42:37 +0000 (18:42 +0000)]
Merge "Add userId to RecoverableKeyStoreDb"
Ivan Lozano [Thu, 21 Dec 2017 18:29:00 +0000 (18:29 +0000)]
Merge "Fix doFadingAnimationLocked in sanitized builds."
Jiuyu Sun [Thu, 21 Dec 2017 18:28:36 +0000 (18:28 +0000)]
Merge "Add asn1 to platform."
abdalkader [Thu, 21 Dec 2017 18:12:07 +0000 (18:12 +0000)]
Merge "SMS over IMS APIs revision"
Andrew Solovay [Thu, 21 Dec 2017 17:56:48 +0000 (17:56 +0000)]
Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev am:
7835c650b2
am:
7ad3eb8db0 -s ours
Change-Id: Ib0b4de07702d6a7337e47f72fe1b5d31039a5454
Bill Yi [Thu, 21 Dec 2017 17:55:45 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours
am:
bd14c44fd8 -s ours
Change-Id: I0560d15c8c2df65b61818ccbb12f5057d1a0c5c8
Treehugger Robot [Thu, 21 Dec 2017 17:54:34 +0000 (17:54 +0000)]
Merge "Add Notification Flag behavior test"
Bill Yi [Thu, 21 Dec 2017 17:53:27 +0000 (17:53 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours am:
daa1d87e50 -s ours am:
0e62ea2f4c -s ours am:
c5dff435b0 -s ours
am:
16a7391b2a -s ours
Change-Id: I5a1fa1ae1bd8cf10fe404fc43f0e5e3357d48af1
Bill Yi [Thu, 21 Dec 2017 17:52:15 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours
am:
c344f9b1c7 -s ours
Change-Id: I0f33f5e6ba5168e27ed60cb36b762708b641d34a
Bill Yi [Thu, 21 Dec 2017 17:50:54 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours
am:
2c97ca3b62 -s ours
Change-Id: Ia71bb418e6bf22e2347436d883e1bcd1c9937d61
Bill Yi [Thu, 21 Dec 2017 17:50:03 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours
am:
d5a7faea83 -s ours
Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab
Tony Mantler [Wed, 20 Dec 2017 23:53:33 +0000 (15:53 -0800)]
Move ServiceListing to SettingsLib and add tests
Bug:
70902607
Test: RunSettingsLibRoboTests
Change-Id: I172092f8c249e76667136442080d5fd7a6a6ef01
Bill Yi [Thu, 21 Dec 2017 17:48:29 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours
am:
51fc07ad61 -s ours
Change-Id: I336996e228fd3c69f192d3614207f24cec0b4ed8
Bill Yi [Thu, 21 Dec 2017 17:44:38 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours
am:
0bfcd7eef7 -s ours
Change-Id: I30395fbf54d028c4f2e8bd21aa362e9d8e993195
Andrew Solovay [Thu, 21 Dec 2017 17:42:46 +0000 (17:42 +0000)]
Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev
am:
7835c650b2
Change-Id: I662ac186b079d88fc503fa546b52b1297b98a036
Bill Yi [Thu, 21 Dec 2017 17:42:25 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e1ca34b5c7 -s ours
Change-Id: Ie97a72b89d17e982dbe499c26c956dafffe5effa
Bill Yi [Thu, 21 Dec 2017 17:42:12 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours
am:
5943ef281a -s ours
Change-Id: I9758d713fb9328b7f2218dae49e334f16a703476
Bill Yi [Thu, 21 Dec 2017 17:42:08 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours
am:
05e41d0531 -s ours
Change-Id: I730f5dcee5ea85c408f7cf21dafab011e869d66d
Sanket Padawe [Thu, 21 Dec 2017 17:41:40 +0000 (17:41 +0000)]
Merge "Receiving side Call handover API implementation."
am:
3c7bc2dc06
Change-Id: I7badcfaf9d308fb05745b0f37ee99603f5eee1c2
Bill Yi [Thu, 21 Dec 2017 17:41:01 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7ce772e941 -s ours
Change-Id: I0a8e327692fb18d67b9e724ce3254f3c342206b9
Chenbo Feng [Thu, 21 Dec 2017 17:38:12 +0000 (17:38 +0000)]
Merge "Use NetworkStatsService to get stats for apps"
am:
693d8a2ab1
Change-Id: I81a28a172e69fc405e99eb9c3a4fd0c729ca613d
Bill Yi [Thu, 21 Dec 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours
am:
a683975c54 -s ours
Change-Id: I54b9b28c9ad38ad19c1e7f228e2e095dfd5cabe3
Bill Yi [Thu, 21 Dec 2017 17:35:51 +0000 (17:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours
am:
e135a35edf -s ours
Change-Id: Ib75ec7b79501a31cab373f919c06a791a7ad9a4a
Fan Zhang [Thu, 21 Dec 2017 17:29:32 +0000 (17:29 +0000)]
Merge "Enable settings search v2 experiement"
TreeHugger Robot [Thu, 21 Dec 2017 17:20:04 +0000 (17:20 +0000)]
Merge "Allow system server to query local WiFi MAC address"
Phil Weaver [Thu, 21 Dec 2017 17:12:29 +0000 (17:12 +0000)]
Merge "Fix accessibility reporting for lock screen PIN"
TreeHugger Robot [Thu, 21 Dec 2017 17:12:12 +0000 (17:12 +0000)]
Merge "Added @TestApi on new Autofill settings for field classification."
Paul McLean [Tue, 19 Dec 2017 18:14:36 +0000 (12:14 -0600)]
Using new usbhost function usb_device_get_string_ucs2() to get USB descriptor strings.
Bug:
70163357
Test: Manual - Connect NuForce (micro) DAC. Examine device name descriptor string.
Note also that it doesn't reboot the device on connection. Verify that audio
plays correctly.
Change-Id: I4b607c51a951cf503fde0b485793dfc9e593f932
Naomi Musgrave [Thu, 21 Dec 2017 16:09:32 +0000 (16:09 +0000)]
Merge "Add id to SecurityEvent."
TreeHugger Robot [Thu, 21 Dec 2017 16:09:21 +0000 (16:09 +0000)]
Merge "Move clock to the left, carrier text to the bottom"
TreeHugger Robot [Thu, 21 Dec 2017 16:00:22 +0000 (16:00 +0000)]
Merge "Add plsCertsNoVerifyOnlyCerts to ApkSignatureVerifier."
Naomi Musgrave [Tue, 28 Nov 2017 10:56:47 +0000 (10:56 +0000)]
Add id to SecurityEvent.
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/SecurityEventTest.java
Bug:
63910201
Change-Id: I053ec9d6c8281d637ace5dc89057e5f7b5ad6554
Treehugger Robot [Thu, 21 Dec 2017 15:27:44 +0000 (15:27 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE"
Treehugger Robot [Thu, 21 Dec 2017 15:27:23 +0000 (15:27 +0000)]
Merge "Testables lib should not statically link mockito"
Philip P. Moltmann [Thu, 21 Dec 2017 15:24:59 +0000 (15:24 +0000)]
Merge "Testables lib should not statically link mockito"
Evan Laird [Mon, 18 Dec 2017 16:22:39 +0000 (11:22 -0500)]
Move clock to the left, carrier text to the bottom
This change moves the clock to the left of status bar and QS screen.
Also removes the date/alarm clock group at the bottom of QS and replaces
it with carrier text.
Test: visual
Bug:
63772836
Bug:
70799093
Change-Id: I7d0a30c126c52745237c647a4af5af46d8418f30
Chrison.chai [Wed, 15 Nov 2017 01:31:26 +0000 (09:31 +0800)]
Fix random systemui crashes during cts test DO NOT MERGE
systemui may crash due
to an uninitialized value of mNavigationBar probably because
of some race condition during initialization caused by emulation
performance issues:
11-01 19:48:58.634 5064 5064 E AndroidRuntime: FATAL EXCEPTION: main
11-01 19:48:58.634 5064 5064 E AndroidRuntime: Process: com.android.systemui, PID: 5064
11-01 19:48:58.634 5064 5064 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'void com.android.systemui.statusbar.phone.LightBarTransitionsController.dump (java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[])' on a null object reference
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.statusbar.phone.LightBarController.dump(LightBarController.java:241)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.statusbar.phone.StatusBar.dump(StatusBar.java:3448)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.SystemBars.dump(SystemBars.java:48)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.SystemUIService.dump(SystemUIService.java:52)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.handleDumpService(ActivityThread.java:3488)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.-wrap9(Unknown Source:0)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.handleMessage(ActivityThread.java:1726)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:105)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.os.Looper.loop(Looper.java:164)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:6541)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.internal.os.Zygote.run(Zygote.java:240)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:767)
This patches adds an explicit checks for (mNavigationBar != null)
everywhere it is used.
Test: cts test.
Change-Id: I8056aef54a10bbb1970bc2ce4913e7a618498fd3
TreeHugger Robot [Thu, 21 Dec 2017 13:37:42 +0000 (13:37 +0000)]
Merge "Profile lock timeout."
Robert Berry [Thu, 21 Dec 2017 13:37:23 +0000 (13:37 +0000)]
Add userId to RecoverableKeyStoreDb
We need to store the userId (i.e., the uid of the *profile*, not the
app), as well as the app uid. This is because when the screen is
unlocked, the unlock is associated with a specific user profile, not
a specific app. So at that point we need to look up all keys that
are pending sync for that *user*, and upload them to the remote
storage.
Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I6c456cca8974f5e1a15dfde6e9dd4e6bf4c16065
TreeHugger Robot [Thu, 21 Dec 2017 13:26:16 +0000 (13:26 +0000)]
Merge "Use testng for utilities in tests"
Paul Duffin [Thu, 21 Dec 2017 12:53:20 +0000 (12:53 +0000)]
Merge "Remove android.test.mock classes from android.jar"
Bernardo Rufino [Thu, 21 Dec 2017 11:43:16 +0000 (11:43 +0000)]
Use testng for utilities in tests
Frameworks services tests and cts already use it.
Test: m -j RunFrameworksServicesRoboTests
Change-Id: Ib613997e9a7278f6b424cd4ce4aa16c112756564
Paul Duffin [Fri, 15 Dec 2017 15:49:08 +0000 (15:49 +0000)]
Remove android.test.mock classes from android.jar
This removes all android.test.mock from the main android.jar.
This change is being done now rather than wait until they can all be
removed together because the code base is a moving target. Doing this
change minimizes the window during which other developers could either
revert the previous changes that make this possible or add new code that
relies on the android.test.mock classes being in android.jar and so
would require yet more changes.
Bug:
30188076
Test: make checkbuild
Change-Id: I3d31e4528c99e2e297aaec9c4b657bdd305bd464
Narayan Kamath [Thu, 21 Dec 2017 09:43:38 +0000 (09:43 +0000)]
WorkSource: Fix NPE on set(int) / set(int, String).
mChains might be null.
Bug:
62390666
Test: WorkSourceTest
Test: run cts-dev -m CtsOsTestCases -t android.os.cts.WorkSourceTest
Change-Id: I1dbc2abc576c280ad41ad6214745b0d34c5727a0
Robert Berry [Thu, 21 Dec 2017 08:42:53 +0000 (08:42 +0000)]
Merge "Add tests for KeySyncUtils now that SecureBox is available"
Zhi An Ng [Thu, 21 Dec 2017 06:20:22 +0000 (06:20 +0000)]
Merge "Fix over-granting permission on low ram"
TreeHugger Robot [Thu, 21 Dec 2017 06:16:24 +0000 (06:16 +0000)]
Merge "Remove the hacky HashableDimensionKey."
TreeHugger Robot [Thu, 21 Dec 2017 06:15:04 +0000 (06:15 +0000)]
Merge "Add log source filtering in statsd to filter out spams."
TreeHugger Robot [Thu, 21 Dec 2017 05:34:56 +0000 (05:34 +0000)]
Merge "Notify RecoverableKeyStoreLoader about successful unlock."
Hugo Benichi [Thu, 21 Dec 2017 05:01:49 +0000 (05:01 +0000)]
Merge "MacAddress: address api review comments"
TreeHugger Robot [Thu, 21 Dec 2017 04:55:15 +0000 (04:55 +0000)]
Merge changes Ie1eb63dc,Ib7cc4d52
* changes:
Renames setCallbackOnComplete method in ContextHubTransaction
Rename ContextHubTransaction.Result IntDef
TreeHugger Robot [Thu, 21 Dec 2017 04:48:35 +0000 (04:48 +0000)]
Merge "New Autofill API:AutofillManager.getAutofillServiceComponentName()"
TreeHugger Robot [Thu, 21 Dec 2017 04:10:23 +0000 (04:10 +0000)]
Merge "Remove scale effect from screen off animation"