OSDN Git Service
Beverly [Mon, 21 May 2018 23:06:40 +0000 (16:06 -0700)]
Merge "Setup mAreChannelsBypassingDnd from notifPolicy" into pi-dev am:
88bdf18545
am:
94fe7b3cd7
Change-Id: Iae7e84290de38be666bdb372c9025ceefb90b53b
Colin Cross [Mon, 21 May 2018 22:46:00 +0000 (15:46 -0700)]
[automerger skipped] Merge changes from topic "aapt2-warn-manifest-validation" am:
61f92e7e13 am:
8fd234045d -s ours
am:
986e5160f6 -s ours
Change-Id: I7de85849261be00a32f8c1d0165a27815cc356ea
Adam Lesinski [Mon, 21 May 2018 22:41:01 +0000 (15:41 -0700)]
[automerger skipped] AAPT2: Better error messages for ManifestFixer am:
b2b20f26db am:
6671fe5c8e -s ours
am:
04fe1bd0de -s ours
Change-Id: Iaa2d79b697246497c5e694ae44138be6c3b34730
Adam Lesinski [Mon, 21 May 2018 22:31:12 +0000 (15:31 -0700)]
[automerger skipped] AAPT2: Differentiate between Android and Java package names am:
ef506c73bb am:
5cc5fdd0dc -s ours
am:
937001be50 -s ours
Change-Id: I52e938af2ded636732a50327662083c02274660d
Beverly [Mon, 21 May 2018 22:30:15 +0000 (15:30 -0700)]
Merge "Setup mAreChannelsBypassingDnd from notifPolicy" into pi-dev
am:
88bdf18545
Change-Id: I9b4798307a260ffaeb7bc26e970fdd7c79d90910
Adam Lesinski [Mon, 21 May 2018 22:22:36 +0000 (15:22 -0700)]
[automerger skipped] Merge "Change ownership of AAPT2 and libandroidfw" am:
1e0a5d397d am:
06eb87271d -s ours
am:
d3be7501bf -s ours
Change-Id: I1a3e865f91288c9ec9118c018d1ed65ca3d7933f
Colin Cross [Mon, 21 May 2018 22:20:43 +0000 (15:20 -0700)]
[automerger skipped] Merge changes from topic "aapt2-warn-manifest-validation" am:
61f92e7e13
am:
8fd234045d -s ours
Change-Id: Ic87193813a8f87ef37556026b0e19f2632464112
TreeHugger Robot [Mon, 21 May 2018 22:17:52 +0000 (22:17 +0000)]
Merge "Setup mAreChannelsBypassingDnd from notifPolicy" into pi-dev
Adam Lesinski [Mon, 21 May 2018 22:16:56 +0000 (15:16 -0700)]
[automerger skipped] AAPT2: Better error messages for ManifestFixer am:
b2b20f26db
am:
6671fe5c8e -s ours
Change-Id: Ibf21d14fd06c84ec2bcf92e58b8e4c95659cf333
Adam Lesinski [Mon, 21 May 2018 22:12:18 +0000 (15:12 -0700)]
[automerger skipped] AAPT2: Differentiate between Android and Java package names am:
ef506c73bb
am:
5cc5fdd0dc -s ours
Change-Id: Ie50856b30994185dbf5ff706349296efcac5d24d
Adam Lesinski [Mon, 21 May 2018 22:08:25 +0000 (15:08 -0700)]
[automerger skipped] Merge "Change ownership of AAPT2 and libandroidfw" am:
1e0a5d397d
am:
06eb87271d -s ours
Change-Id: I01c79f94b57cdd64a97670e4b7a2e163000487ac
Jordan Liu [Mon, 21 May 2018 22:07:39 +0000 (15:07 -0700)]
Merge "Change directory where apns-conf.xml is stored" am:
d25198f62f am:
d15962b260
am:
0bdaa497a5
Change-Id: Ia2f81c8a006df622bfce244693eb883acb123cf2
Jordan Liu [Mon, 21 May 2018 21:48:41 +0000 (14:48 -0700)]
Merge "Change directory where apns-conf.xml is stored" am:
d25198f62f
am:
d15962b260
Change-Id: Ib0416da63f166b5e3a0ac2ef4210d92eaa39a9ab
Colin Cross [Mon, 21 May 2018 21:40:05 +0000 (14:40 -0700)]
Merge changes from topic "aapt2-warn-manifest-validation"
am:
61f92e7e13
Change-Id: Idb04f6750abd4dbdce62979794f68833a39e4c3b
Adam Lesinski [Mon, 21 May 2018 21:35:28 +0000 (14:35 -0700)]
AAPT2: Better error messages for ManifestFixer
am:
b2b20f26db
Change-Id: I1d661e2d11e929ae0930863d5ed2e344c97a9e28
Adam Lesinski [Mon, 21 May 2018 21:30:41 +0000 (14:30 -0700)]
AAPT2: Differentiate between Android and Java package names
am:
ef506c73bb
Change-Id: I7b5dd69303106eba5959684dc3b6a4af24876c94
Adam Lesinski [Mon, 21 May 2018 21:24:37 +0000 (14:24 -0700)]
Merge "Change ownership of AAPT2 and libandroidfw"
am:
1e0a5d397d
Change-Id: I3a3dcce247b9eae100df4b3b6a89b02ef163e87d
Jordan Liu [Mon, 21 May 2018 21:20:34 +0000 (14:20 -0700)]
Merge "Change directory where apns-conf.xml is stored"
am:
d25198f62f
Change-Id: I33db5a97978e17d82da98344c25788fc3bb42e89
Christopher Ferris [Mon, 21 May 2018 21:14:10 +0000 (21:14 +0000)]
Merge "Remove unnecessary references to libunwind."
Ying Zheng [Mon, 21 May 2018 21:02:40 +0000 (14:02 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev am:
ab38e73af6
am:
ffcd82cad0 -s ours
Change-Id: I9148f59b3abb6fa246d4025700e06d4d1d1ac8ea
Beverly [Mon, 21 May 2018 20:14:15 +0000 (16:14 -0400)]
Setup mAreChannelsBypassingDnd from notifPolicy
Test: atest RankingHelperTest
Change-Id: I34d9c8dfb5924bab0e496e37d5b93715c48b78ad
Fixes:
80078295
Ying Zheng [Mon, 21 May 2018 20:54:58 +0000 (13:54 -0700)]
Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev
am:
ab38e73af6
Change-Id: I99bed9c05a1cb49757f3f330d672f6dc4d10615f
Stanley Tng [Mon, 21 May 2018 20:50:20 +0000 (13:50 -0700)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev am:
aef6efeef5
am:
898361c1c4
Change-Id: I4a9b9c0c0cde059e3de2d4184e5a43dc445d9a69
Ying Zheng [Mon, 21 May 2018 20:44:23 +0000 (20:44 +0000)]
Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev
Stanley Tng [Mon, 21 May 2018 20:39:49 +0000 (13:39 -0700)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev
am:
aef6efeef5
Change-Id: Ic4ac46d5de65f83ca9e5b27bef44de17c5b94fe8
Mike Digman [Mon, 21 May 2018 20:35:19 +0000 (13:35 -0700)]
Merge "Extend rotation button timeout duration" into pi-dev am:
4b0351d53f
am:
19e32a0e63
Change-Id: I92ddc0d19b3eb72973064900416892b18e505287
Mike Digman [Mon, 21 May 2018 20:25:56 +0000 (13:25 -0700)]
Merge "Extend rotation button timeout duration" into pi-dev
am:
4b0351d53f
Change-Id: Ia6c3008ac77389e9e04a9ce1cab7d0a49c6d29d3
Svet Ganov [Mon, 21 May 2018 20:25:50 +0000 (13:25 -0700)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev am:
c81ed627ab
am:
13a27a82a2
Change-Id: Ib7645f1b350ba0e7ed571eb98e739d0a31c4e435
Svet Ganov [Mon, 21 May 2018 20:20:56 +0000 (13:20 -0700)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev
am:
c81ed627ab
Change-Id: I7fe9c3d9eb3f291698501ef23fdd449f41d0e3d1
Suprabh Shukla [Mon, 21 May 2018 20:20:37 +0000 (13:20 -0700)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev am:
d0897f2b65
am:
485cdce1ca
Change-Id: I6f60f14a705e354fab5f08382a146be7f9dd9f2d
TreeHugger Robot [Mon, 21 May 2018 20:20:31 +0000 (20:20 +0000)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev
Suprabh Shukla [Mon, 21 May 2018 20:11:40 +0000 (13:11 -0700)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev
am:
d0897f2b65
Change-Id: Ia624b12b32d06b7e341f7023231000ffb1fb530b
Svetoslav Ganov [Mon, 21 May 2018 20:11:12 +0000 (13:11 -0700)]
Merge "Make RemoteCallback test API" into pi-dev am:
a757fd7827
am:
573a696f8f
Change-Id: Iab9be37d714d1d1b8eec032d9dabbcd5cb056834
Mike Digman [Mon, 21 May 2018 20:09:24 +0000 (20:09 +0000)]
Merge "Extend rotation button timeout duration" into pi-dev
Svetoslav Ganov [Mon, 21 May 2018 20:04:51 +0000 (13:04 -0700)]
Merge "Make RemoteCallback test API" into pi-dev
am:
a757fd7827
Change-Id: Iea481e8a4716bddf48a64d9370d248ffa7871158
TreeHugger Robot [Mon, 21 May 2018 20:03:10 +0000 (20:03 +0000)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 20:01:36 +0000 (20:01 +0000)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev
Svetoslav Ganov [Mon, 21 May 2018 19:55:12 +0000 (19:55 +0000)]
Merge "Make RemoteCallback test API" into pi-dev
Colin Cross [Mon, 21 May 2018 19:52:24 +0000 (19:52 +0000)]
Merge changes from topic "aapt2-warn-manifest-validation"
* changes:
AAPT2: treat manifest validation errors as warnings when asked
AAPT2: Better error messages for ManifestFixer
AAPT2: Differentiate between Android and Java package names
Izabela Orlowska [Tue, 19 Dec 2017 16:22:42 +0000 (16:22 +0000)]
AAPT2: treat manifest validation errors as warnings when asked
Bug:
65670329
Test: updated
Change-Id: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9
Merged-In: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9
(cherry picked from commit
ad9e1324ff2c459d0ee6ee571d4a3e458c02cc81)
Adam Lesinski [Thu, 2 Nov 2017 19:07:08 +0000 (12:07 -0700)]
AAPT2: Better error messages for ManifestFixer
AAPT2 will now print the XML hierarchy where it found an unexpected
element.
Test: make aapt2_tests
Change-Id: Iac7918b2f344fab874f0a3e7aa9c6936ecde8913
Merged-In: Iac7918b2f344fab874f0a3e7aa9c6936ecde8913
(cherry picked from commit
ed37f4842ad838792b16bf19768ed9b2519b0194)
Chenbo Feng [Mon, 21 May 2018 19:50:12 +0000 (12:50 -0700)]
Merge "Check for bpf support at NetworkStatsService start" into pi-dev am:
6555a9fa16
am:
e20463ba06
Change-Id: Ib5acef029a83ce8fa219a8b7d1edc17c71fc2df5
Adam Lesinski [Mon, 6 Nov 2017 18:44:46 +0000 (10:44 -0800)]
AAPT2: Differentiate between Android and Java package names
Android package names are more strict (ASCII only) than Java package names.
Also fixed an issue where trailing underscores were disallowed in Android
package names.
(cherry picked from commit
96ea08f1e737e0d19e274e9a29f71c387d81b09a)
Also includes part of I357fb84941bfbb3892a8c46feb47f55b865b6649 to remove
usage of FindNonAlphaNumericAndNotInSet.
Bug:
79481102
Test: make aapt2_tests
Change-Id: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Merged-In: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Treehugger Robot [Mon, 21 May 2018 19:46:00 +0000 (19:46 +0000)]
Merge "Change ownership of AAPT2 and libandroidfw"
Lucas Dupin [Mon, 21 May 2018 19:45:48 +0000 (12:45 -0700)]
Merge "Keep scrim black when "always on" is off" into pi-dev am:
402e2a2b6f
am:
1c63bdcce2
Change-Id: I38cfb0e6560e70c4a9bb66d48a18cdc5d84b89f8
Chenbo Feng [Mon, 21 May 2018 19:44:23 +0000 (12:44 -0700)]
Merge "Check for bpf support at NetworkStatsService start" into pi-dev
am:
6555a9fa16
Change-Id: If2fd9e040e4717f1040c16e4b5f6c61cfc14e140
Yohei Yukawa [Mon, 21 May 2018 19:40:59 +0000 (12:40 -0700)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev am:
711a8f7f28
am:
682b36a5ae
Change-Id: Ia0269a871d174e02a9d3a8a59d6f5be92cde3f9b
Lucas Dupin [Mon, 21 May 2018 19:36:44 +0000 (12:36 -0700)]
Merge "Keep scrim black when "always on" is off" into pi-dev
am:
402e2a2b6f
Change-Id: Iecc4ff6e4f1861e8adec33e912d71be051ccb98d
Yohei Yukawa [Mon, 21 May 2018 19:29:13 +0000 (12:29 -0700)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev
am:
711a8f7f28
Change-Id: I7ac74ec1076ad7160475b9595e00db85eea9f818
Yangster-mac [Mon, 21 May 2018 19:27:13 +0000 (12:27 -0700)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev am:
76cb7fe2f6
am:
02b40158ab
Change-Id: I7445eb13283b007738182e2a5ac4808a87124a11
TreeHugger Robot [Mon, 21 May 2018 19:19:59 +0000 (19:19 +0000)]
Merge "Check for bpf support at NetworkStatsService start" into pi-dev
Ben Wagner [Mon, 21 May 2018 19:19:08 +0000 (19:19 +0000)]
Merge "Clean up Bitmap allocation size computation."
Jordan Liu [Mon, 21 May 2018 19:06:54 +0000 (19:06 +0000)]
Merge "Change directory where apns-conf.xml is stored"
Ryan Mitchell [Mon, 21 May 2018 19:06:13 +0000 (12:06 -0700)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev am:
fd37ec90b8
am:
b3da3a9673
Change-Id: Ic715bc6db56328c47da4a30a3e46ea92bbf10f92
Yangster-mac [Mon, 21 May 2018 19:01:32 +0000 (12:01 -0700)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev
am:
76cb7fe2f6
Change-Id: I4bb331330c505396427bb72ff7b69c2b6653ba97
Bill Yi [Mon, 21 May 2018 18:57:10 +0000 (11:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
35426e5e69 -s ours
am:
33ad5a99dd -s ours
Change-Id: Ifc05f3503a635804c9008e28ccc5cf807f69905b
Ryan Mitchell [Mon, 21 May 2018 18:53:56 +0000 (11:53 -0700)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
am:
fd37ec90b8
Change-Id: I3030d62104142b33dfb9844faa2fcb9840d8ee61
Bill Yi [Mon, 21 May 2018 18:43:21 +0000 (11:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
346e04785d -s ours
am:
491a78548b -s ours
Change-Id: I31e6a4d193027b9bad66d36e391bff93be6928b6
Bill Yi [Mon, 21 May 2018 18:42:56 +0000 (11:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
35426e5e69 -s ours
Change-Id: I9ca85e02a0ab28401d9c5715180e8b0323d75c30
Andreas Gampe [Mon, 21 May 2018 18:41:58 +0000 (11:41 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping" am:
923208e8c9 am:
2d47ac0df7
am:
1c015160c6
Change-Id: Id3bd33caa4137b36b7ead74689bf2c0aaa09e3d4
Bill Yi [Mon, 21 May 2018 18:37:07 +0000 (11:37 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
f28ef47762 -s ours
am:
38f9bb955a -s ours
Change-Id: I58084ac82e5999d5ff8443cc1fddbbea99a1cbee
Bill Yi [Mon, 21 May 2018 18:35:29 +0000 (11:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
3743438f5e -s ours
am:
3047866348 -s ours
Change-Id: I807d5fc4dec148159c2dcd57292b7dc6661491bf
Bill Yi [Mon, 21 May 2018 18:32:56 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
998221a361 -s ours
am:
7fb9123a74 -s ours
Change-Id: Ia18a28f533332b12ad01856a81041ff3071d53b6
Bill Yi [Mon, 21 May 2018 18:32:41 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
346e04785d -s ours
Change-Id: I6f15d6341bd4574d65dd9c0eb08fc80482386beb
Bill Yi [Mon, 21 May 2018 18:31:06 +0000 (11:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
addcc20dd4 -s ours
am:
06d509f642 -s ours
Change-Id: I0f94f3a65fd6215824d3743025d8902e995c096e
Andreas Gampe [Mon, 21 May 2018 18:25:06 +0000 (11:25 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping" am:
923208e8c9
am:
2d47ac0df7
Change-Id: Ie4274380bb66a35a6ba12d0f868ae78ef80f4b0d
Lucas Dupin [Mon, 21 May 2018 18:23:59 +0000 (18:23 +0000)]
Merge "Keep scrim black when "always on" is off" into pi-dev
Mike Digman [Mon, 21 May 2018 18:23:56 +0000 (11:23 -0700)]
Extend rotation button timeout duration
Moving from 6s to 10s timeout when navbar is visible.
Change-Id: I3a7067c37f254698ae53fdb9208576f3e486c8ce
Fixes:
79981820
Test: manual
Ying Zheng [Thu, 10 May 2018 20:02:07 +0000 (13:02 -0700)]
DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper.
Test: Build
Bug:
79417730
Change-Id: I52c9b0f5ba01b85e36242b112ef9bbcc54a08e48
Bill Yi [Mon, 21 May 2018 18:18:24 +0000 (11:18 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
f28ef47762 -s ours
Change-Id: Ieed9e65080e7aba8701d23ef5b416fc4b896ea7f
Bill Yi [Mon, 21 May 2018 18:18:03 +0000 (11:18 -0700)]
Merge changes from topic "am-
d326b840-2575-4e69-8ec2-
5cfa14046328" into oc-dev am:
99e6aa1b1e am:
d88c6877da am:
aa55d5db76 am:
b138eaa7b7
am:
370e6da71a
Change-Id: I992104d24ba9708f8ccb34a2871c2104acf6f9ec
Andreas Gampe [Mon, 21 May 2018 18:17:24 +0000 (11:17 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping"
am:
923208e8c9
Change-Id: Ifed1ed567587b7616880f3b640d3162c57a40644
Bill Yi [Mon, 21 May 2018 18:17:01 +0000 (11:17 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
3743438f5e -s ours
Change-Id: I92b0c74b35b8b5d6e98053202d8529e25fee3eaf
TreeHugger Robot [Mon, 21 May 2018 18:15:43 +0000 (18:15 +0000)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev
Bill Yi [Mon, 21 May 2018 18:13:26 +0000 (11:13 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
998221a361 -s ours
Change-Id: I85f9d555bfdf76d0b0ebcfc25c351304c208b9ef
Bill Yi [Mon, 21 May 2018 18:11:36 +0000 (11:11 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
addcc20dd4 -s ours
Change-Id: Id0247616a981fcc59b0956bf0ba29f0e96d7980a
Bill Yi [Mon, 21 May 2018 18:10:57 +0000 (11:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb skipped:
ea0127f477 am:
4f1f428661 -s ours am:
a53d91e485 -s ours am:
5e1f17a880 -s ours am:
91d2623fe0 -s ours
am:
654d5044ef -s ours
Change-Id: I403ab21dbffb7d9b091d412a3504cedd1aca9f2f
TreeHugger Robot [Mon, 21 May 2018 18:05:00 +0000 (18:05 +0000)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev
Bill Yi [Mon, 21 May 2018 18:04:38 +0000 (11:04 -0700)]
Merge changes from topic "am-
d326b840-2575-4e69-8ec2-
5cfa14046328" into oc-dev am:
99e6aa1b1e am:
d88c6877da am:
aa55d5db76
am:
b138eaa7b7
Change-Id: Idf0ba5b3480762902f3df610bd313653c2111550
TreeHugger Robot [Mon, 21 May 2018 17:59:35 +0000 (17:59 +0000)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
Bill Yi [Mon, 21 May 2018 17:57:38 +0000 (10:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb skipped:
ea0127f477 am:
4f1f428661 -s ours am:
a53d91e485 -s ours am:
5e1f17a880 -s ours
am:
91d2623fe0 -s ours
Change-Id: I66d8b302db8bd7f2397cfeff65a73fa96f6c28fa
TreeHugger Robot [Mon, 21 May 2018 17:57:26 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:56:41 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:54:35 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:54:31 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:53:32 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:51:35 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bernie Innocenti [Mon, 21 May 2018 17:42:13 +0000 (10:42 -0700)]
[automerger skipped] Merge changes from topic "apf-read-ram" am:
b5dda0e316 am:
0ec7b1e85e -s ours
am:
7ef34d8629 -s ours
Change-Id: I2ce8a520f0bb744329bb7c9c2782bdbc1f8ace3f
Bill Yi [Mon, 21 May 2018 17:41:15 +0000 (10:41 -0700)]
Merge changes from topic "am-
d326b840-2575-4e69-8ec2-
5cfa14046328" into oc-dev am:
99e6aa1b1e am:
d88c6877da
am:
aa55d5db76
Change-Id: If6e65aa957489e085d1a96be0367e158c43ebc5b
Bill Yi [Mon, 21 May 2018 17:34:57 +0000 (10:34 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb skipped:
ea0127f477 am:
4f1f428661 -s ours am:
a53d91e485 -s ours
am:
5e1f17a880 -s ours
Change-Id: I5fdb579286d6ddce6f6a20b2fab243b33840bf93
Bernie Innocenti [Mon, 21 May 2018 17:32:00 +0000 (10:32 -0700)]
[automerger skipped] Merge changes from topic "apf-read-ram" am:
b5dda0e316
am:
0ec7b1e85e -s ours
Change-Id: I8fac093bd2a55d6c59856374fa31d88207fc7623
Bill Yi [Mon, 21 May 2018 17:28:44 +0000 (10:28 -0700)]
Merge changes from topic "am-
d326b840-2575-4e69-8ec2-
5cfa14046328" into oc-dev am:
99e6aa1b1e
am:
d88c6877da
Change-Id: I0acd60a59fcb928752ce7bf952bbfe9f65b68ff4
Roshan Pius [Mon, 21 May 2018 17:26:51 +0000 (10:26 -0700)]
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev am:
95509057f8
am:
dee99a1b2b
Change-Id: I9274ba934a102a17d554133caed5ede6cce551b0
Bill Yi [Mon, 21 May 2018 17:24:41 +0000 (10:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb skipped:
ea0127f477 am:
4f1f428661 -s ours
am:
a53d91e485 -s ours
Change-Id: Ife13f7c8262521ddc28deb4ceaf5b27b9765c792
Stanley Tng [Sun, 13 May 2018 22:08:33 +0000 (15:08 -0700)]
Fix the Hearing Aids connected state in Settings App
When two Hearing Aids devices are bonded, we should only show one device
in the Settings App and at the correct location based on the connected
state of the HA devices. When at least one HA device is connected, then
the Settings App should show it as connected. Otherwise, the Settings
App should show it as disconnected when both devices are disconnected.
Bug:
79760469
Test: Run the robotests for Settings and SettingsLib
Change-Id: I33e19af054b686b3d71b00dcbd6ff16febde6099
Roshan Pius [Mon, 21 May 2018 17:20:11 +0000 (10:20 -0700)]
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev
am:
95509057f8
Change-Id: I73fc1ed24e79689315ed5d4501a412afce24f6e8
Bill Yi [Mon, 21 May 2018 17:19:31 +0000 (10:19 -0700)]
Merge changes from topic "am-
d326b840-2575-4e69-8ec2-
5cfa14046328" into oc-dev
am:
99e6aa1b1e
Change-Id: Id35ca83236112898b4e39b3cb173be70c435168f
Bill Yi [Mon, 21 May 2018 17:17:56 +0000 (10:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb skipped:
ea0127f477
am:
4f1f428661 -s ours
Change-Id: Iac8c22f36859d6648ae856236c9a97080238cae5
Lucas Dupin [Sat, 19 May 2018 00:24:52 +0000 (17:24 -0700)]
Keep scrim black when "always on" is off
The first frame when waking up is expensive and we
need a black scrim hiding what was left behind.
Bug:
78022321
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Change-Id: I99e2b7960daf2cbe51bec6aee4b15c74d532078c
Roshan Pius [Mon, 21 May 2018 17:04:10 +0000 (17:04 +0000)]
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev
OSDN Git Service
