OSDN Git Service
Nan Zhang [Fri, 13 Apr 2018 18:57:32 +0000 (11:57 -0700)]
[automerger skipped] Merge "Add filegroup for supporting apache-http stubs generation." am:
828f14d58a
am:
25a088a857 -s ours
Change-Id: I2dd9118d2c6ca912ce6271f966989292f638ece0
Fan Zhang [Fri, 13 Apr 2018 18:45:57 +0000 (11:45 -0700)]
Merge "Add optional metadata to specify icon's background color." into pi-dev
am:
72634cae72
Change-Id: If469bf3f35e7cb9816f56ab90c966e7114c0a731
Nan Zhang [Fri, 13 Apr 2018 18:39:54 +0000 (11:39 -0700)]
Merge "Add filegroup for supporting apache-http stubs generation."
am:
828f14d58a
Change-Id: I89b6c648aa9136219c949607ff704486f429457c
Bill Yi [Fri, 13 Apr 2018 18:38:17 +0000 (11:38 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
f2799545f5 -s ours
Change-Id: Ia0ab74ed882a130754d70488f67a8ccd4f0c7701
Ryan Mitchell [Fri, 13 Apr 2018 18:31:37 +0000 (11:31 -0700)]
Merge "AAPT2: GetBag infinite recursion fix" into pi-dev
am:
3ddd801449
Change-Id: I7f007e8d2ebe4e288759892cf4c9365e80490e38
Bill Yi [Fri, 13 Apr 2018 18:24:00 +0000 (11:24 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
7e41f31bc2 -s ours
Change-Id: I9a40628b9d1f3abd1279043837aba6853a295cee
Bill Yi [Fri, 13 Apr 2018 18:15:51 +0000 (11:15 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
b6134dc727 -s ours
Change-Id: Ia1cb9519ada5712f7f6a109d3b5e4051dd0ea7e7
Bill Yi [Fri, 13 Apr 2018 18:13:15 +0000 (11:13 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
04543e7ab3 -s ours
Change-Id: If6a28bb8248393d2de550fcbe2110f2885b5bd7e
Bill Yi [Fri, 13 Apr 2018 18:07:48 +0000 (11:07 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
2e9addbad7 -s ours
Change-Id: I2b7d409f55e7b7d9af5ea15e89fd63bbc64610fb
Bill Yi [Fri, 13 Apr 2018 18:05:54 +0000 (11:05 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
04e0ef903e -s ours
Change-Id: Ib94d814b181735e3a03c617a1cfc17ec61f2e261
Bill Yi [Fri, 13 Apr 2018 18:03:22 +0000 (11:03 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
213639c93e -s ours
Change-Id: I0820d2d422bfcd388d604e4193998c3856b2221b
Michael Wright [Fri, 13 Apr 2018 17:59:47 +0000 (10:59 -0700)]
Merge "Revert "Fixed power manager CTS test."" into pi-dev
am:
ca1dcfb23e
Change-Id: Ie748557c6940961635cdd929238f1bd2070e8804
TreeHugger Robot [Fri, 13 Apr 2018 17:48:22 +0000 (17:48 +0000)]
Merge "Add optional metadata to specify icon's background color." into pi-dev
Bill Yi [Fri, 13 Apr 2018 17:46:43 +0000 (10:46 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
07d10c7ac5 -s ours
Change-Id: I8025fb04a57a060a4b843341ec2a347a0a8e7dc7
TreeHugger Robot [Fri, 13 Apr 2018 17:44:39 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Ryan Mitchell [Fri, 13 Apr 2018 17:44:11 +0000 (17:44 +0000)]
Merge "AAPT2: GetBag infinite recursion fix" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 17:42:03 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 17:41:09 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 17:40:15 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 17:38:13 +0000 (17:38 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 17:36:14 +0000 (17:36 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 17:34:19 +0000 (17:34 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Michael Wright [Fri, 13 Apr 2018 17:33:15 +0000 (17:33 +0000)]
Merge "Revert "Fixed power manager CTS test."" into pi-dev
Michael Wright [Fri, 13 Apr 2018 17:29:37 +0000 (17:29 +0000)]
Revert "Fixed power manager CTS test."
This reverts commit
48fed61da3f3671850aae3c521a3e6f088169de2.
Reason for revert: m checkbuild failing
Bug:
77907164
Change-Id: I7f75dafc049581a7a5393c3cf0108c488eecaf48
TreeHugger Robot [Fri, 13 Apr 2018 17:31:19 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Treehugger Robot [Fri, 13 Apr 2018 17:28:22 +0000 (17:28 +0000)]
Merge "Add filegroup for supporting apache-http stubs generation."
Dan Gittik [Fri, 13 Apr 2018 17:21:15 +0000 (10:21 -0700)]
Merge "Fixed power manager CTS test." into pi-dev
am:
62444d4950
Change-Id: I96d0acccf64a86a241178241dc6fc9b069f29ac8
TreeHugger Robot [Fri, 13 Apr 2018 16:59:28 +0000 (16:59 +0000)]
Merge "Fixed power manager CTS test." into pi-dev
Winson Chung [Fri, 13 Apr 2018 16:53:06 +0000 (09:53 -0700)]
Merge "Initialize the animation leash with the current values" into pi-dev
am:
9f54f109bb
Change-Id: Ida4d8c0c53f963b4c1bee20d4879bb2bfdf779db
Lifu Tang [Fri, 13 Apr 2018 16:47:27 +0000 (09:47 -0700)]
Merge "Mark location-related PendingIntents as restricted" into pi-dev
am:
b3ac00ea9c
Change-Id: Ie9ca7886858033c2ca46d090d46e74679b4e0c23
Winson Chung [Fri, 13 Apr 2018 16:41:18 +0000 (16:41 +0000)]
Merge "Initialize the animation leash with the current values" into pi-dev
Lifu Tang [Fri, 13 Apr 2018 16:30:40 +0000 (16:30 +0000)]
Merge "Mark location-related PendingIntents as restricted" into pi-dev
Beverly [Fri, 13 Apr 2018 15:59:37 +0000 (08:59 -0700)]
Merge "Don't show ringer status if dnd overrides it" into pi-dev
am:
a4e8196cf8
Change-Id: Ic6f4fcf844c403f117a49843f5b6ea84f943be41
y [Thu, 12 Apr 2018 21:26:23 +0000 (14:26 -0700)]
AAPT2: GetBag infinite recursion fix
Style resources with circular parental dependencies caused infinite
recursion when calling AssetManager2::GetBag. This fix allows recursion
to cease when a circular dependency is found.
Bug:
77928512
Change-Id: Ib900c36ab1aef5da5b03234a9484c4dad3b63c02
Test: Manual test of b/
77928512 and duplicates of
74493983
TreeHugger Robot [Fri, 13 Apr 2018 15:43:22 +0000 (15:43 +0000)]
Merge "Don't show ringer status if dnd overrides it" into pi-dev
David Brazdil [Fri, 13 Apr 2018 14:58:43 +0000 (07:58 -0700)]
Merge "Add more hidden API on light greylist" into pi-dev
am:
d55a940e9f
Change-Id: I2c126962323a65e04314b1e8aeb0bafc4c03aa98
David Brazdil [Fri, 13 Apr 2018 14:46:47 +0000 (14:46 +0000)]
Merge "Add more hidden API on light greylist" into pi-dev
Dan Gittik [Fri, 13 Apr 2018 14:43:20 +0000 (15:43 +0100)]
Fixed power manager CTS test.
Added an annotation necessary to allow the power manager CTS test to
access the non-public method nap.
Test: adb install -r \
out/host/linux-x86/cts/android-cts/testcases/CtsOsTestCases.apk
adb shell am instrument -e class android.os.cts.PowerManagerTest \
-w android.os.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I91e591be608f5040bc035a203d7e94c83d50bf15
Fixes:
77907164
Jason Monk [Fri, 13 Apr 2018 13:50:46 +0000 (06:50 -0700)]
Merge "Protect slice permissions text" into pi-dev
am:
e791b67448
Change-Id: If65f285e9525b9f5b5212e3fede65ef4d378c312
TreeHugger Robot [Fri, 13 Apr 2018 13:40:10 +0000 (13:40 +0000)]
Merge "Protect slice permissions text" into pi-dev
Amin Shaikh [Fri, 13 Apr 2018 13:07:48 +0000 (06:07 -0700)]
Merge "Do not allow QS to collapsed when customizing." into pi-dev
am:
e7cda17369
Change-Id: Ib204944c69d8bef3e894e350dd29ef9856eade43
Bill Yi [Fri, 13 Apr 2018 13:02:06 +0000 (06:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5b400d5bf5084cfdfc40edd2e44f19d5b1b659ac
Bill Yi [Fri, 13 Apr 2018 12:55:12 +0000 (05:55 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1832a5760945374d87d8d01b3289e3b67014da9c
TreeHugger Robot [Fri, 13 Apr 2018 12:54:15 +0000 (12:54 +0000)]
Merge "Do not allow QS to collapsed when customizing." into pi-dev
Jiyong Park [Fri, 13 Apr 2018 12:30:44 +0000 (05:30 -0700)]
[automerger skipped] Merge "Make android.test.mock.stubs in Android.bp" am:
5f29cbb53b
am:
cfd30c5f43 -s ours
Change-Id: If050bb11934319b44b7513ffcec0d6020edf5571
Jiyong Park [Fri, 13 Apr 2018 12:16:01 +0000 (05:16 -0700)]
Merge "Make android.test.mock.stubs in Android.bp"
am:
5f29cbb53b
Change-Id: I8859b904e6413a6bf1055fdb9f21e100d9e68d6a
Chalard Jean [Fri, 13 Apr 2018 11:52:08 +0000 (04:52 -0700)]
Merge "Notif manager and captive portal app to read SSID again" into pi-dev
am:
249b1a34c3
Change-Id: I663a59ff2847a9f44ea1395326f6cb00e97237b6
TreeHugger Robot [Fri, 13 Apr 2018 11:41:32 +0000 (11:41 +0000)]
Merge "Notif manager and captive portal app to read SSID again" into pi-dev
Bill Yi [Fri, 13 Apr 2018 11:13:26 +0000 (04:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic5c3b8a83e48276c715b767d5a0cb9b61debe0b9
Bill Yi [Fri, 13 Apr 2018 11:06:40 +0000 (04:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I306b4fef65e3282c9b4c43839dd64667152a4f66
Treehugger Robot [Fri, 13 Apr 2018 10:55:05 +0000 (10:55 +0000)]
Merge "Make android.test.mock.stubs in Android.bp"
Emilian Peev [Fri, 13 Apr 2018 10:32:14 +0000 (03:32 -0700)]
Merge "CameraProxy: Clear calling identity before scheduling" into pi-dev
am:
fdad4c513d
Change-Id: Ia6bf69e08b8b2949077e93345e27bc61b6bcc073
Eran Messeri [Fri, 13 Apr 2018 10:22:24 +0000 (03:22 -0700)]
Merge "AttestationUtils: Request MEID explicitly" into pi-dev
am:
ec6268c514
Change-Id: I024cb4ef4743271ae24526e96c0786ae97028733
TreeHugger Robot [Fri, 13 Apr 2018 10:13:43 +0000 (10:13 +0000)]
Merge "CameraProxy: Clear calling identity before scheduling" into pi-dev
Adrian Roos [Fri, 13 Apr 2018 10:12:50 +0000 (03:12 -0700)]
Merge "PointerLocation: do not letterbox for cutouts" into pi-dev
am:
637422b2bf
Change-Id: Iecf814ec2e79f8624af88104ba581ea634063658
Eran Messeri [Fri, 13 Apr 2018 10:07:36 +0000 (10:07 +0000)]
Merge "AttestationUtils: Request MEID explicitly" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 09:59:45 +0000 (09:59 +0000)]
Merge "PointerLocation: do not letterbox for cutouts" into pi-dev
Bill Yi [Fri, 13 Apr 2018 09:44:18 +0000 (02:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I88071bb02adecf089e39dfee4a6add3f5ded6cae
Bill Yi [Fri, 13 Apr 2018 09:19:08 +0000 (02:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib75133d5980ff748e1e9ed9f3fba99ffc40629f2
Chalard Jean [Fri, 13 Apr 2018 09:14:02 +0000 (02:14 -0700)]
Merge "Add a new ssid field in NetworkCapabilities." into pi-dev
am:
878d0e90b5
Change-Id: Ia1f4e51b7c2e9118789242cf6d9e7576c4167cda
Bill Yi [Fri, 13 Apr 2018 09:12:24 +0000 (02:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib2d68bcafafbf825f4f78870f815c3a43aadd8fe
TreeHugger Robot [Fri, 13 Apr 2018 08:59:23 +0000 (08:59 +0000)]
Merge "Add a new ssid field in NetworkCapabilities." into pi-dev
Bill Yi [Fri, 13 Apr 2018 08:58:29 +0000 (01:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie360a601ab29fe76cb0df7c0b8ba43480de9bfd3
Benjamin Franz [Fri, 13 Apr 2018 07:51:25 +0000 (00:51 -0700)]
Merge "Silently ignore force stop API for protected packages" into pi-dev
am:
df88614db2
Change-Id: I1490c123b60b05798584306af9c971a3411729cc
Bo Zhu [Fri, 13 Apr 2018 07:39:18 +0000 (00:39 -0700)]
Merge "Use Scrypt to hash all passwords in RecoverableKeyStore" into pi-dev
am:
2bc6f2e46a
Change-Id: Ia9ed056e9b33ec7375a3b61ece17f22eb1d16f0d
Benjamin Franz [Fri, 13 Apr 2018 07:37:25 +0000 (07:37 +0000)]
Merge "Silently ignore force stop API for protected packages" into pi-dev
Bo Zhu [Fri, 13 Apr 2018 07:22:48 +0000 (07:22 +0000)]
Merge "Use Scrypt to hash all passwords in RecoverableKeyStore" into pi-dev
Chalard Jean [Thu, 12 Apr 2018 02:52:37 +0000 (11:52 +0900)]
Notif manager and captive portal app to read SSID again
Bug:
77114259
Test: frameworks-net pass
manual test shows the SSID is now displayed again
Change-Id: I5cb2b4777ad78d972031e8f2ff22e2155f4ab894
Chalard Jean [Wed, 11 Apr 2018 12:09:10 +0000 (21:09 +0900)]
Add a new ssid field in NetworkCapabilities.
Bug:
77891227
Test: frameworks-net
Change-Id: Ifba33ecd48ccecce7e8f8d05ff70bb85653f6163
Mehdi Alizadeh [Fri, 13 Apr 2018 04:48:16 +0000 (21:48 -0700)]
Merge "Adds SettingsCompat to mirror settings names used in Launcher" into pi-dev
am:
eb914118f4
Change-Id: Id9ebbd549a80103e235717c9d599ed25fa8033d4
Mehdi Alizadeh [Fri, 13 Apr 2018 04:33:23 +0000 (04:33 +0000)]
Merge "Adds SettingsCompat to mirror settings names used in Launcher" into pi-dev
Chen Xu [Fri, 13 Apr 2018 03:39:57 +0000 (20:39 -0700)]
Merge "A test api to override carrier information" am:
420ab92b0b
am:
700b21d7cd
Change-Id: Id71dd0534b784d757bde6cd8ca88f3eb35aaf007
Tomasz Wasilczyk [Fri, 13 Apr 2018 03:31:21 +0000 (20:31 -0700)]
Merge "Fix AM band range." into pi-dev
am:
9d86920cb4
Change-Id: I30a020f8c87d08bca06ec4b6bb0ff68377f3cd0b
Tomasz Wasilczyk [Fri, 13 Apr 2018 03:13:18 +0000 (03:13 +0000)]
Merge "Fix AM band range." into pi-dev
Jason Monk [Fri, 13 Apr 2018 03:03:23 +0000 (20:03 -0700)]
Merge "Fix pinned slices returning different Uris." into pi-dev
am:
b672c1f97c
Change-Id: If07c9fb4b3391cce7c555430ffb5b0fbdb760777
TreeHugger Robot [Fri, 13 Apr 2018 02:48:39 +0000 (02:48 +0000)]
Merge "Fix pinned slices returning different Uris." into pi-dev
Sunny Goyal [Fri, 13 Apr 2018 02:45:15 +0000 (19:45 -0700)]
Merge "Exposing activity type in targets so that we can handle home activity differently" into pi-dev
am:
6dfad28bed
Change-Id: I1ba8a38d6de62a69f5029b131f490e9495d4d998
TreeHugger Robot [Fri, 13 Apr 2018 02:32:38 +0000 (02:32 +0000)]
Merge "Exposing activity type in targets so that we can handle home activity differently" into pi-dev
Lucas Dupin [Fri, 13 Apr 2018 02:22:20 +0000 (19:22 -0700)]
Merge "Fix measurement of list with single item" into pi-dev
am:
beefded4c7
Change-Id: Ie8f03831bb249591ef4308abade4ba7162b53aa4
Jiyong Park [Tue, 13 Mar 2018 07:06:03 +0000 (16:06 +0900)]
Make android.test.mock.stubs in Android.bp
Stubs libraries android.test.mock.stubs and
android.test.mock.stubs-system are now built in Android.bp.
(Note that API check and update are still done in Android.mk)
As a good side effect, this allows android.test.runner[-minus-junit]
libraries (that are defined in Android.bp) to be built with the
android.test.mock.stubs instead of the runtime library
android.test.mock. This in turn allows us to prevent java:sdk ->
java:platform dependency also in Soong, because the runner libraries
were the only violators.
Bug:
73829976
Test: m -j android.test.mock.stubs android.test.mock.stubs-system
Test: m -j checkapi
Test: m -j update-api
Merged-In: I830a8eb13aa43b9aa4c8394f3c2fd91ee18b1f85
Change-Id: I830a8eb13aa43b9aa4c8394f3c2fd91ee18b1f85
(cherry picked from commit
e649b8066c3385ba0b667a79d378402b15ef3127)
TreeHugger Robot [Fri, 13 Apr 2018 02:09:27 +0000 (02:09 +0000)]
Merge "Fix measurement of list with single item" into pi-dev
Mehdi Alizadeh [Fri, 13 Apr 2018 01:59:36 +0000 (18:59 -0700)]
Adds SettingsCompat to mirror settings names used in Launcher
Bug:
77732469
Test: verify it builds
Change-Id: I2d0dee714a7d5eb59f189302d97414f3117a624b
Aarthi Balachander [Fri, 13 Apr 2018 01:15:05 +0000 (18:15 -0700)]
Merge "Have UserController use a CarUserSwitchingDialog instead of a UserSwitchingDialog if the FEATURE_AUTOMOTIVE flag is present so Android Auto can customize the look of the dialog." into pi-dev
am:
f2b624c140
Change-Id: If9a45e147db78d02d71059895d4d52692d7c98f6
Sunny Goyal [Fri, 13 Apr 2018 01:09:38 +0000 (18:09 -0700)]
Exposing activity type in targets so that we can handle home activity differently
Test: Verified library with launcher
Bug:
77830202
Change-Id: I072013725190aced116093808029973b278ed263
Chen Xu [Fri, 13 Apr 2018 01:09:55 +0000 (18:09 -0700)]
Merge "A test api to override carrier information"
am:
420ab92b0b
Change-Id: I4dd105740b4c4954a387d46a76157c9d24b602e8
Hansong Zhang [Fri, 13 Apr 2018 01:09:08 +0000 (18:09 -0700)]
Merge "Fix the null check in LocalBluetoothProfileManager" into pi-dev
am:
3f9520e6f3
Change-Id: I5f2b6a3157d3941cde33544fa4b856641e183ee0
Lucas Dupin [Fri, 13 Apr 2018 00:45:29 +0000 (17:45 -0700)]
Fix measurement of list with single item
Change-Id: I2474410b7374155bbbe5de0c757e9017f52746e5
Fixes:
72656378
Test: visual
Yi Jin [Fri, 13 Apr 2018 00:27:38 +0000 (17:27 -0700)]
Merge "Add tests to cover handling negative varint." into pi-dev
am:
9a58caaaff
Change-Id: I0d7ee09e8d0243fa5dd82114431e8ca0135ed49a
Jason Monk [Mon, 9 Apr 2018 12:10:59 +0000 (08:10 -0400)]
Protect slice permissions text
Bug:
72749457
Change-Id: I4c1820b2696b61d51f9a3d500b16b4c323fa731f
TreeHugger Robot [Fri, 13 Apr 2018 00:24:50 +0000 (00:24 +0000)]
Merge "Have UserController use a CarUserSwitchingDialog instead of a UserSwitchingDialog if the FEATURE_AUTOMOTIVE flag is present so Android Auto can customize the look of the dialog." into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 00:20:16 +0000 (00:20 +0000)]
Merge "Fix the null check in LocalBluetoothProfileManager" into pi-dev
Winson Chung [Fri, 13 Apr 2018 00:14:50 +0000 (17:14 -0700)]
Initialize the animation leash with the current values
- We already do this with remote animations, need to do this with the
recents animation to ensure that layers are set correctly by default.
Bug:
77981669
Test: Open app, open translucent activity, swipe up and ensure that they
don't reorder during the transition
Change-Id: I492d12b871c602e348ea0623752787b8b0ac3f10
Andrew Sapperstein [Fri, 13 Apr 2018 00:08:11 +0000 (17:08 -0700)]
Merge "Revert "Revert "Update material_deep_teal_500 to #008577.""" into pi-dev
am:
d0fdef9229
Change-Id: I32e24ab2c5526aaebb864ab90cd7ca2eef3ca5d0
Jason Monk [Thu, 12 Apr 2018 23:47:50 +0000 (19:47 -0400)]
Fix pinned slices returning different Uris.
Test: cts
Bug:
77980070
Change-Id: I3c5ba18e40a58371e2c9ccade9d565b38ad12a54
Lifu Tang [Thu, 12 Apr 2018 23:39:39 +0000 (16:39 -0700)]
Mark location-related PendingIntents as restricted
Bug:
77237719
Test: build and flash a device
Change-Id: Id12792aca29fef6adff4943c551c03e6eb6e851c
Kweku Adams [Thu, 12 Apr 2018 23:53:13 +0000 (16:53 -0700)]
Merge "Adding privacy tags to graphicsstats proto." into pi-dev
am:
8e97f6f86f
Change-Id: Iece43851e390e172b404815c5829a60a473178a9
Jovana Knezevic [Thu, 12 Apr 2018 23:40:55 +0000 (16:40 -0700)]
Merge "Fixing when the full-screen switcher appears." into pi-dev
am:
4c5341c4b9
Change-Id: I44a54096ac3a6c119a33e292a14eccc72760c797
TreeHugger Robot [Thu, 12 Apr 2018 23:36:29 +0000 (23:36 +0000)]
Merge "Add tests to cover handling negative varint." into pi-dev
Nathan Harold [Thu, 12 Apr 2018 23:36:10 +0000 (16:36 -0700)]
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev
am:
ade0186795
Change-Id: I94821c8390473ea96c2c8f9a674e736587807477
Julia Reynolds [Thu, 12 Apr 2018 23:30:55 +0000 (16:30 -0700)]
Merge "Fix volume panel shadows" into pi-dev
am:
79634c7025
Change-Id: I05197c633b20ef7a17e8b5d17cb120cad3be9967
OSDN Git Service
