OSDN Git Service
Jeff Sharkey [Tue, 17 Apr 2018 00:44:58 +0000 (17:44 -0700)]
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
am:
936c0868f8
Change-Id: I3c84c646b3a79f09dc1210e18f48d1f87d38abd4
Malcolm Chen [Tue, 17 Apr 2018 00:39:13 +0000 (17:39 -0700)]
Merge "Fix UiccSlotInfo equals method." into pi-dev
am:
82c0b73e98
Change-Id: Ide54ab7f3b29b7bde846aa292f121bef0baa13cb
Christopher Tate [Tue, 17 Apr 2018 00:33:24 +0000 (17:33 -0700)]
Merge "Treat named standby states as ceilings of behavioral categories" into pi-dev
am:
f3015eb0df
Change-Id: I10e1114a4619c65c78d9177800ffe04b80039228
Tomasz Wasilczyk [Tue, 17 Apr 2018 00:19:56 +0000 (17:19 -0700)]
Merge "Remove setDeviceConnectionState hack for radio mute/unmute." into pi-dev
am:
0e07ed14a2
Change-Id: I22cd7b0373d006180e6beeb7c395f0d8976c380b
Jeff Sharkey [Tue, 17 Apr 2018 00:04:53 +0000 (00:04 +0000)]
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
Hidenari Koshimae [Tue, 17 Apr 2018 00:02:46 +0000 (17:02 -0700)]
Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev
am:
8be1197c5d
Change-Id: I41dc263a13f67e7d4772343b1c10f52383786bd2
Tyler Gunn [Mon, 16 Apr 2018 23:57:15 +0000 (16:57 -0700)]
Merge "Add permission whitelist for EmergencyInfo app." into pi-dev
am:
1417d6c543
Change-Id: I6edbde2c8cc7628703b45492d006f5c97485a083
TreeHugger Robot [Mon, 16 Apr 2018 23:56:06 +0000 (23:56 +0000)]
Merge "Fix UiccSlotInfo equals method." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 23:48:41 +0000 (23:48 +0000)]
Merge "Treat named standby states as ceilings of behavioral categories" into pi-dev
Tomasz Wasilczyk [Mon, 16 Apr 2018 23:37:10 +0000 (23:37 +0000)]
Merge "Remove setDeviceConnectionState hack for radio mute/unmute." into pi-dev
Bill Yi [Mon, 16 Apr 2018 23:31:15 +0000 (16:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
309a2818b9 -s ours
Change-Id: Ie41b9bdd8fbeeb2951679352f0ff33d8779e90b6
TreeHugger Robot [Mon, 16 Apr 2018 23:25:39 +0000 (23:25 +0000)]
Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev
Tyler Gunn [Mon, 16 Apr 2018 23:23:39 +0000 (23:23 +0000)]
Merge "Add permission whitelist for EmergencyInfo app." into pi-dev
David Chen [Mon, 16 Apr 2018 23:21:23 +0000 (16:21 -0700)]
Merge "Adds a code when statsd sends intent to getData." into pi-dev
am:
17d2de09cb
Change-Id: I4f429329603d7dfe512de6802d4f083d230fc4d1
Pavlin Radoslavov [Mon, 16 Apr 2018 23:09:02 +0000 (16:09 -0700)]
Merge "Add A2DP set/get active device to greylist" into pi-dev
am:
20afb74074
Change-Id: Ie8d76434404cec0cf34958828dd89bdf36632852
Android Build Merger (Role) [Mon, 16 Apr 2018 23:06:14 +0000 (23:06 +0000)]
Merge "Merge "Migrate android.test.base.stubs generation to Soong." am:
c263ce5e25 am:
cca80fbe4c" into pi-dev-plus-aosp
Nan Zhang [Mon, 16 Apr 2018 23:05:50 +0000 (16:05 -0700)]
Merge "Migrate android.test.base.stubs generation to Soong." am:
c263ce5e25
am:
cca80fbe4c
Change-Id: I352387b460e7969356f9cc355dd92f83771aa3a7
Dan Cashman [Mon, 16 Apr 2018 23:04:34 +0000 (16:04 -0700)]
Merge "Replace PackageInfo#signingCertificateHistory field doc reference." into pi-dev
am:
82f36b120d
Change-Id: I6a0b86e427ecb1e889cb39bae1b3e99248daea16
TreeHugger Robot [Mon, 16 Apr 2018 22:57:27 +0000 (22:57 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Amin Shaikh [Mon, 16 Apr 2018 22:56:25 +0000 (15:56 -0700)]
Merge "Dismiss low battery warning on toggling saver." into pi-dev
am:
223074533a
Change-Id: Iee5a691744504cab069502a012efa7baec310161
Dmitry Dementyev [Mon, 16 Apr 2018 22:50:16 +0000 (15:50 -0700)]
Merge "Remove implementation of deprecated RecoveryController methods." into pi-dev
am:
5291268754
Change-Id: Ic390d4b001ec63db78e5f8effc59a1c445153c6a
TreeHugger Robot [Mon, 16 Apr 2018 22:46:03 +0000 (22:46 +0000)]
Merge "Adds a code when statsd sends intent to getData." into pi-dev
Nan Zhang [Mon, 16 Apr 2018 22:45:05 +0000 (15:45 -0700)]
Merge "Migrate android.test.base.stubs generation to Soong."
am:
c263ce5e25
Change-Id: If7b1aafcee9be34385802315f4fd6ef71459e761
TreeHugger Robot [Mon, 16 Apr 2018 22:41:38 +0000 (22:41 +0000)]
Merge "Add A2DP set/get active device to greylist" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:40:56 +0000 (22:40 +0000)]
Merge "Replace PackageInfo#signingCertificateHistory field doc reference." into pi-dev
Julia Reynolds [Mon, 16 Apr 2018 22:33:02 +0000 (15:33 -0700)]
Merge "Remove streams from system_server" into pi-dev
am:
58a476920f
Change-Id: I691024ab57a37519694838bc7dd5faed9af99910
Tony Mak [Mon, 16 Apr 2018 22:27:19 +0000 (15:27 -0700)]
Merge "Fix instant app badge" into pi-dev
am:
c1dd5b0b30
Change-Id: I651808687a1a6275bab34a0c3398f0e089ea4ffe
TreeHugger Robot [Mon, 16 Apr 2018 22:19:45 +0000 (22:19 +0000)]
Merge "Dismiss low battery warning on toggling saver." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:14:22 +0000 (22:14 +0000)]
Merge "Remove implementation of deprecated RecoveryController methods." into pi-dev
Rubin Xu [Mon, 16 Apr 2018 22:13:34 +0000 (15:13 -0700)]
Merge "Remove unnecessary disk access when loading synthetic password states" into pi-dev
am:
ece60739aa
Change-Id: Ic443dc0cb20282a89a274835375037689ab6d8f4
Julia Reynolds [Mon, 16 Apr 2018 22:13:07 +0000 (22:13 +0000)]
Merge "Remove streams from system_server" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:08:33 +0000 (22:08 +0000)]
Merge "Fix instant app badge" into pi-dev
Pavlin Radoslavov [Mon, 16 Apr 2018 21:36:00 +0000 (14:36 -0700)]
Add A2DP set/get active device to greylist
Bug:
74238896
Bug:
78132844
Test: compile
Change-Id: If20ed03e6f579f06856e3e9cb6d4882313bfdc1b
Rubin Xu [Mon, 16 Apr 2018 21:58:33 +0000 (21:58 +0000)]
Merge "Remove unnecessary disk access when loading synthetic password states" into pi-dev
Jeff Sharkey [Mon, 16 Apr 2018 21:51:17 +0000 (14:51 -0700)]
Merge "Use OS package name when identity cleared." into pi-dev
am:
6ac9a23f9b
Change-Id: Idff51642de785375c35f32b2bd60bc2fd80272d8
Dan Cashman [Mon, 16 Apr 2018 21:41:24 +0000 (14:41 -0700)]
Replace PackageInfo#signingCertificateHistory field doc reference.
During API review, PackageInfo#signingCertificateHistory was changed
to PackageInfo#signingInfo. This was not reflected everywhere in
the documentation. Update it.
Bug:
74831530
Test: Doc change only, builds.
Change-Id: I497cdd732dffacf376ac05f7ccd181004c947210
TreeHugger Robot [Mon, 16 Apr 2018 21:43:58 +0000 (21:43 +0000)]
Merge "Use OS package name when identity cleared." into pi-dev
Amin Shaikh [Mon, 16 Apr 2018 21:35:18 +0000 (14:35 -0700)]
Merge "Allow left-right swiping from edges in QS." into pi-dev
am:
28493adea6
Change-Id: I9aa7df4f0917816896eaddefdea76ee1208e4438
Julia Reynolds [Mon, 16 Apr 2018 21:29:36 +0000 (14:29 -0700)]
Merge "Always show or hide volume dialog" into pi-dev
am:
3c20a18e14
Change-Id: Id7fafcefdf9b9081c895237b3ed20c9bf6fefaec
Treehugger Robot [Mon, 16 Apr 2018 21:24:45 +0000 (21:24 +0000)]
Merge "Migrate android.test.base.stubs generation to Soong."
TreeHugger Robot [Mon, 16 Apr 2018 21:22:55 +0000 (21:22 +0000)]
Merge "Allow left-right swiping from edges in QS." into pi-dev
Jiuyu Sun [Mon, 16 Apr 2018 21:20:02 +0000 (14:20 -0700)]
Merge "Fix typos." into pi-dev
am:
2135c52b4d
Change-Id: I2f700355d8f4476a875e4b95df17e7441b0332b4
TreeHugger Robot [Mon, 16 Apr 2018 21:19:15 +0000 (21:19 +0000)]
Merge "Always show or hide volume dialog" into pi-dev
Bill Yi [Mon, 16 Apr 2018 20:59:51 +0000 (13:59 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev am:
231719b4d2 am:
60fb81edda am:
f84cc88320
am:
b95650a1ba
Change-Id: If6be4a98e37745157bed0dbb5f2f25785d43d294
Bill Yi [Mon, 16 Apr 2018 20:53:45 +0000 (13:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553 am:
fde5e09eeb -s ours am:
490f12c8c1 -s ours am:
0af21ab046 -s ours
am:
46eac73f6a -s ours
Change-Id: Iad505c39d07c4fd4025518f4bafdfbd494edf935
Hall Liu [Mon, 16 Apr 2018 20:51:53 +0000 (13:51 -0700)]
[automerger skipped] Merge "Move RTT system setting to Settings.Secure" am:
9a51f07117
am:
5f0cbc215d -s ours
Change-Id: Ibbae5f7cd07e12e4b6c52f9e260dfb8562cdf930
Jiuyu Sun [Mon, 16 Apr 2018 20:48:52 +0000 (20:48 +0000)]
Merge "Fix typos." into pi-dev
Bill Yi [Mon, 16 Apr 2018 20:47:20 +0000 (13:47 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev am:
231719b4d2 am:
60fb81edda
am:
f84cc88320
Change-Id: I6cd93c965df3aa652a1b669df2a88acd3a6c4e24
Bill Yi [Mon, 16 Apr 2018 20:43:42 +0000 (13:43 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054 am:
bfcb8b99a5 -s ours am:
f62419973f -s ours am:
d9352518aa -s ours
am:
f227dadb99 -s ours
Change-Id: Ic929b21fc7b24fe65ea8364dfd0686c383bd3b57
Bill Yi [Mon, 16 Apr 2018 20:42:12 +0000 (13:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553 am:
fde5e09eeb -s ours am:
490f12c8c1 -s ours
am:
0af21ab046 -s ours
Change-Id: If9dff24f3fff2a9916d74874e2bc682b5a037c8d
Bill Yi [Mon, 16 Apr 2018 20:41:53 +0000 (13:41 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425 am:
cb80417eab -s ours am:
3194fdd40a -s ours am:
923f65751a -s ours
am:
42cb72318b -s ours
Change-Id: Ic55365f484ace53aacb4dd76006d193c05591f21
Bill Yi [Mon, 16 Apr 2018 20:38:59 +0000 (13:38 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288 am:
67841fe1e6 -s ours am:
97ddc81da4 -s ours am:
3b3379f16a -s ours
am:
8d9df4b042 -s ours
Change-Id: I14f58ca53b0c9e94c34d727f7f20c13a8e255843
Bill Yi [Mon, 16 Apr 2018 20:35:40 +0000 (13:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28 am:
d12aff917a -s ours am:
06e9f9dad5 -s ours am:
06ce4b2618 -s ours
am:
e2d8e005b2 -s ours
Change-Id: I4c7aa83b17d5e437616c4674fda27128852503b2
Philip P. Moltmann [Mon, 16 Apr 2018 20:33:49 +0000 (13:33 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am:
6173fbe12e am:
6a845fe056 am:
1d9e95553b
am:
9aab64bd1c
Change-Id: Ie0c30d5ae70783f955e4a50a155f5c8c2c5f806e
Bill Yi [Mon, 16 Apr 2018 20:27:02 +0000 (13:27 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054 am:
bfcb8b99a5 -s ours am:
f62419973f -s ours
am:
d9352518aa -s ours
Change-Id: Idc313d4c705d68edb65c057dfc5eb6e8e9efa80e
Bill Yi [Mon, 16 Apr 2018 20:24:55 +0000 (13:24 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425 am:
cb80417eab -s ours am:
3194fdd40a -s ours
am:
923f65751a -s ours
Change-Id: I8b64a8fbbbcd92a6a949bcae98b44f37c0a4e09c
Bill Yi [Mon, 16 Apr 2018 20:23:17 +0000 (13:23 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288 am:
67841fe1e6 -s ours am:
97ddc81da4 -s ours
am:
3b3379f16a -s ours
Change-Id: I24f1dae0a8fc333cd2668f1085a81c1755a37707
Bill Yi [Mon, 16 Apr 2018 20:21:23 +0000 (13:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28 am:
d12aff917a -s ours am:
06e9f9dad5 -s ours
am:
06ce4b2618 -s ours
Change-Id: I21bade1db7ee51f5ccbdd4afd08f3399c2e886e7
Philip P. Moltmann [Mon, 16 Apr 2018 20:19:04 +0000 (13:19 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am:
6173fbe12e am:
6a845fe056
am:
1d9e95553b
Change-Id: Icb9e0c7261da6147d7d70be9f243fb387799c58f
Hall Liu [Mon, 16 Apr 2018 20:08:16 +0000 (13:08 -0700)]
Merge "Move RTT system setting to Settings.Secure"
am:
9a51f07117
Change-Id: I226e9a91725f7755595c3530162829f8bf61b135
Philip P. Moltmann [Mon, 16 Apr 2018 20:06:05 +0000 (13:06 -0700)]
[automerger skipped] [automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f am:
874fe98a8f am:
9b71a72cb0 skipped:
f1776f0805 am:
877a845005 am:
885bcab242 am:
c201aff50a -s ours
am:
b7af9ee423
Change-Id: I83d588b64dd04b95658dafe9028df8bf3cd0bc19
Malcolm Chen [Sat, 14 Apr 2018 02:33:08 +0000 (19:33 -0700)]
Fix UiccSlotInfo equals method.
In UiccSlotInfo#equals method, it's comparing Strings incorrectly.
Bug:
78033760
Test: GTS test
Change-Id: I4fed0a70ee0ef06bcf7a1af544e6aebced31d9c2
Philip P. Moltmann [Mon, 16 Apr 2018 19:50:03 +0000 (12:50 -0700)]
[automerger skipped] [automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f am:
874fe98a8f am:
9b71a72cb0 skipped:
f1776f0805 am:
877a845005 am:
885bcab242
am:
c201aff50a -s ours
Change-Id: Ie8b5e0cabb3abfa917653993f1010b3c5db7e5af
Ryan Mitchell [Mon, 16 Apr 2018 19:45:57 +0000 (12:45 -0700)]
Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev
am:
61ac57283f
Change-Id: Ibd7e47e33d49e6c609b9b73960186020728ac0f5
Christopher Tate [Tue, 27 Mar 2018 23:04:14 +0000 (16:04 -0700)]
Treat named standby states as ceilings of behavioral categories
For purposes of alarm dispatch & job execution, intermediate standby
states are now treated as the ceilings of the range associated with each
bucket, rather than as the floor. So, for example, a value that is
between STANDBY_BUCKET_WORKING_SET and STANDBY_BUCKET_ACTIVE is now
treated as equivalent to STANDBY_BUCKET_WORKING_SET.
Bug:
77154340
Test: atest CtsJobSchedulerTestCases
Change-Id: I84d010863eecaac011dd117205980254487bfa64
Caxton Chan [Mon, 16 Apr 2018 19:35:04 +0000 (12:35 -0700)]
Merge "Enable feature flag for audio output switcher." into pi-dev
am:
116e05cbba
Change-Id: Id7144fbbf59ca9efeee0f20aa1a988377c87747a
Ryan Mitchell [Mon, 16 Apr 2018 19:28:43 +0000 (19:28 +0000)]
Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev
Caxton Chan [Mon, 16 Apr 2018 19:24:31 +0000 (19:24 +0000)]
Merge "Enable feature flag for audio output switcher." into pi-dev
Hidenari Koshimae [Wed, 11 Apr 2018 09:37:44 +0000 (18:37 +0900)]
Camera: Fix a description for MONOCHROME camera capability
Test: Compile
Bug:
77902724
Change-Id: Ibb6a1d4b5f80a0c4d0e3f29625b03a827a3ed80c
Bill Yi [Mon, 16 Apr 2018 19:20:42 +0000 (12:20 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev am:
231719b4d2
am:
60fb81edda
Change-Id: I5933e96aa34fc6aff073513bdb0400fd02796e62
Bill Yi [Mon, 16 Apr 2018 19:16:09 +0000 (12:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553 am:
fde5e09eeb -s ours
am:
490f12c8c1 -s ours
Change-Id: I5c1579d596c4f444ebee20cf217c3e4872182d0c
Bill Yi [Mon, 16 Apr 2018 19:14:27 +0000 (12:14 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054 am:
bfcb8b99a5 -s ours
am:
f62419973f -s ours
Change-Id: I37dbec1d64219b2c2b57da0535364606b527f3f3
Philip P. Moltmann [Mon, 16 Apr 2018 19:08:05 +0000 (12:08 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am:
cda08919cf am:
d139755de8 am:
5e2a5a8ce1 -s ours
am:
a8b12c4994
Change-Id: I2315205ef2681f5384a12e84a8274fe49d910709
Bill Yi [Mon, 16 Apr 2018 19:01:52 +0000 (12:01 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev
am:
231719b4d2
Change-Id: I5186692869d8849e0abc8d60f97970ce07e273aa
Bill Yi [Mon, 16 Apr 2018 19:00:03 +0000 (12:00 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
am:
fde5e09eeb -s ours
Change-Id: Ife2f1cabaad48b2b89dfe46c6de4f1cfa18c27cc
Bill Yi [Mon, 16 Apr 2018 18:58:54 +0000 (11:58 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425 am:
cb80417eab -s ours
am:
3194fdd40a -s ours
Change-Id: I67f37180a53bdd87975f458ce68ae75890ebec29
Bill Yi [Mon, 16 Apr 2018 18:56:07 +0000 (11:56 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054
am:
bfcb8b99a5 -s ours
Change-Id: I9573bb5fb938d29fbd40c94bb36203607bacdfee
Tomasz Wasilczyk [Fri, 13 Apr 2018 18:41:22 +0000 (11:41 -0700)]
Remove setDeviceConnectionState hack for radio mute/unmute.
Bug:
77863406
Test: it builds, it didn't work anyway
Change-Id: Ib77d34d4c425e341faa52c6e99f7e289be04f433
hughchen [Mon, 16 Apr 2018 18:55:54 +0000 (11:55 -0700)]
Merge "Add new function to get audio state" into pi-dev
am:
e504e1322e
Change-Id: I776ef38002527e9a3db49896b86fe377fce01e8f
Bill Yi [Mon, 16 Apr 2018 18:55:52 +0000 (11:55 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288 am:
67841fe1e6 -s ours
am:
97ddc81da4 -s ours
Change-Id: I0a2be41354fd01b370c95f0f77d67c878bb84d55
Philip P. Moltmann [Mon, 16 Apr 2018 18:55:42 +0000 (11:55 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am:
cda08919cf am:
d139755de8
am:
5e2a5a8ce1 -s ours
Change-Id: I665c1f65a60926a70627db83da5c2c6f3e4f09c8
Bill Yi [Mon, 16 Apr 2018 18:52:51 +0000 (11:52 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425
am:
cb80417eab -s ours
Change-Id: I29e67171958497655f4d0374b2decbc1429135f7
Ricky Wai [Mon, 16 Apr 2018 18:50:44 +0000 (11:50 -0700)]
Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev
am:
ed2a3cadc1
Change-Id: Icb8d0962ddbe4ba4c25b835cc631cedd94c818eb
Bill Yi [Mon, 16 Apr 2018 18:49:23 +0000 (11:49 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288
am:
67841fe1e6 -s ours
Change-Id: Ic7684c0d86e85aaebfb4e459d4dbd57d0d67d3b9
Bill Yi [Mon, 16 Apr 2018 18:46:39 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iedb29c910eba362a7bbe038cd61fe98d8e1097a0
Jeff Sharkey [Mon, 16 Apr 2018 15:50:22 +0000 (09:50 -0600)]
Protect usage data with OP_GET_USAGE_STATS.
APIs that return package usage data (such as the new StatsManager)
must ensure that callers hold both the PACKAGE_USAGE_STATS permission
and the OP_GET_USAGE_STATS app-op.
Add noteOp() method that can be called from native code.
Also add missing security checks on command interface.
Bug:
77662908,
78121728
Test: builds, boots
Change-Id: Ie0d51e4baaacd9d7d36ba0c587ec91a870b9df17
Bill Yi [Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8
Import translations. DO NOT MERGE
Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:53 +0000 (18:42 +0000)]
[automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054
Change-Id: I7cb9fde2607bd5cf254218df7922c552f200d425
Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:48 +0000 (18:42 +0000)]
[automerger] Import translations. DO NOT MERGE am:
ba2da34cdf
Change-Id: Ic48e117b51a8f0d3c2f9a45536b4f85f9100b43e
Hall Liu [Mon, 16 Apr 2018 18:40:28 +0000 (18:40 +0000)]
Merge "Move RTT system setting to Settings.Secure"
Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:14 +0000 (18:39 +0000)]
[automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425
Change-Id: Id86be4edea769f62ae4dd3de5a21a6fe8471151d
Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:09 +0000 (18:39 +0000)]
[automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d
Change-Id: I1a5a8473bb77a315ce84e2656e5640488ecb7881
TreeHugger Robot [Mon, 16 Apr 2018 18:34:37 +0000 (18:34 +0000)]
Merge "Add new function to get audio state" into pi-dev
Android Build Merger (Role) [Mon, 16 Apr 2018 18:33:00 +0000 (18:33 +0000)]
[automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288
Change-Id: Iaf447a22df4ace00079a63066b0dcadce145443b
Android Build Merger (Role) [Mon, 16 Apr 2018 18:32:54 +0000 (18:32 +0000)]
[automerger] Import translations. DO NOT MERGE am:
c7fe3a5972
Change-Id: I9ec7fb1d5c5657b8b4936303d39fbecff498eb46
Andreas Gampe [Mon, 16 Apr 2018 18:21:20 +0000 (11:21 -0700)]
Merge "Revert "Frameworks/base: Compiled-classes support"" am:
087bae3ffe
am:
f6786aeb64
Change-Id: I52f22c3df2a0a8d99d7be0d68fbf11eec2de8024
Ryan Mitchell [Mon, 16 Apr 2018 18:21:14 +0000 (18:21 +0000)]
Revert "AAPT: Modified StringPool uniqueness detection"
This reverts commit
35ecb89a8aa68f24d2e991df5bb9964ad15075dc.
Reason for revert: <Long make duration (infinite loop)>
Change-Id: I10d1cf53ca3054d40e23b06368ebaff6af69beab
Amin Shaikh [Mon, 16 Apr 2018 18:00:09 +0000 (14:00 -0400)]
Dismiss low battery warning on toggling saver.
Change-Id: If6988a67ce0e97c2c9df93648169b9c9b85da7ce
Fixes:
66987022
Test: runtest systemui
Ricky Wai [Mon, 16 Apr 2018 18:19:00 +0000 (18:19 +0000)]
Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev
Andreas Gampe [Mon, 16 Apr 2018 18:10:20 +0000 (11:10 -0700)]
Merge "Revert "Frameworks/base: Compiled-classes support""
am:
087bae3ffe
Change-Id: I32cba3d29b54827ee3d40ea022a1d9eae27cfb0f