OSDN Git Service
Winson Chung [Fri, 13 Apr 2018 17:06:18 +0000 (10:06 -0700)]
Merge "Initialize the animation leash with the current values" into pi-dev am:
9f54f109bb
am:
d981ee95f4
Change-Id: I4458ef4aa86b96cd4ff6340bcbca39a1c5e20dbf
Lifu Tang [Fri, 13 Apr 2018 17:00:47 +0000 (10:00 -0700)]
Merge "Mark location-related PendingIntents as restricted" into pi-dev am:
b3ac00ea9c
am:
581881e092
Change-Id: I6b5d176ddb999cc43cbe26d96dc513fa4c3a8f93
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 16:13:25 +0000 (09:13 -0700)]
Merge "Don't show ringer status if dnd overrides it" into pi-dev am:
a4e8196cf8
am:
3197513e32
Change-Id: Iad0d04f0557c384835595e503c239e1cd28ef2b9
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
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 15:10:49 +0000 (08:10 -0700)]
Merge "Add more hidden API on light greylist" into pi-dev am:
d55a940e9f
am:
6bf2691066
Change-Id: I750d20365ec5257a64c6ef325dcf29875f4d84ac
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
Jason Monk [Fri, 13 Apr 2018 14:04:10 +0000 (07:04 -0700)]
Merge "Protect slice permissions text" into pi-dev am:
e791b67448
am:
b1922e640f
Change-Id: Ifb56bd57e49406a4ffe251067e1be46518ead8f9
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:21:13 +0000 (06:21 -0700)]
Merge "Do not allow QS to collapsed when customizing." into pi-dev am:
e7cda17369
am:
d96b5ed171
Change-Id: Ia0035037b2726a75f0386dee3e50f22d573a23cc
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
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:45:47 +0000 (05:45 -0700)]
[automerger skipped] Merge "Make android.test.mock.stubs in Android.bp" am:
5f29cbb53b am:
cfd30c5f43 -s ours
am:
18cae2e213 -s ours
Change-Id: I5bc63733a7373bdfcda14f747c78ba67f7267a9e
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 12:05:02 +0000 (05:05 -0700)]
Merge "Notif manager and captive portal app to read SSID again" into pi-dev am:
249b1a34c3
am:
9cb91ef301
Change-Id: I588fedba49ea5d08e40bd2b3ea8ba2c2383958ec
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
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:49:20 +0000 (03:49 -0700)]
Merge "CameraProxy: Clear calling identity before scheduling" into pi-dev am:
fdad4c513d
am:
71a331d66a
Change-Id: I4a4e5102dd4d6240573033c678265a38737b4822
Eran Messeri [Fri, 13 Apr 2018 10:41:09 +0000 (03:41 -0700)]
Merge "AttestationUtils: Request MEID explicitly" into pi-dev am:
ec6268c514
am:
3ae9a11cc3
Change-Id: I0bd82a0d811c482debb4795a444ea2d0eefbdc88
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
Adrian Roos [Fri, 13 Apr 2018 10:26:44 +0000 (03:26 -0700)]
Merge "PointerLocation: do not letterbox for cutouts" into pi-dev am:
637422b2bf
am:
7b31adef36
Change-Id: If9c39591eb505740af5d91e31c7357d3d56ca002
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
Chalard Jean [Fri, 13 Apr 2018 09:23:18 +0000 (02:23 -0700)]
Merge "Add a new ssid field in NetworkCapabilities." into pi-dev am:
878d0e90b5
am:
8edf6543d2
Change-Id: I6dd1aba6fde5a502b4a9145cf16393d8ce623c89
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
TreeHugger Robot [Fri, 13 Apr 2018 08:59:23 +0000 (08:59 +0000)]
Merge "Add a new ssid field in NetworkCapabilities." into pi-dev
Benjamin Franz [Fri, 13 Apr 2018 08:04:21 +0000 (01:04 -0700)]
Merge "Silently ignore force stop API for protected packages" into pi-dev am:
df88614db2
am:
83612737a1
Change-Id: I3dc4209e0310495a2c6a035094e919a46f75a03f
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:51:17 +0000 (00:51 -0700)]
Merge "Use Scrypt to hash all passwords in RecoverableKeyStore" into pi-dev am:
2bc6f2e46a
am:
48b5b445b7
Change-Id: I79bfd6563b5e5c8ce03d28f574f751dfa51d33b9
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 05:05:15 +0000 (22:05 -0700)]
Merge "Adds SettingsCompat to mirror settings names used in Launcher" into pi-dev am:
eb914118f4
am:
3118c5768a
Change-Id: Ic07fbe1dad857591e7443906578e1194dd5a618b
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:59:11 +0000 (20:59 -0700)]
Merge "A test api to override carrier information" am:
420ab92b0b am:
700b21d7cd
am:
f3c9cb2a03
Change-Id: I28cd884a6184fa7a9c3f8fc733195b5672745bcb
Tomasz Wasilczyk [Fri, 13 Apr 2018 03:43:55 +0000 (20:43 -0700)]
Merge "Fix AM band range." into pi-dev am:
9d86920cb4
am:
61522dee25
Change-Id: Ic2b4d1c804424da2438c5e8fb58626ad456d745c
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
Jason Monk [Fri, 13 Apr 2018 03:14:49 +0000 (20:14 -0700)]
Merge "Fix pinned slices returning different Uris." into pi-dev am:
b672c1f97c
am:
8e70dd482b
Change-Id: I7d46f978d710f7a559a16a4ceddaf32d05a38fcf
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
Sunny Goyal [Fri, 13 Apr 2018 03:00:11 +0000 (20:00 -0700)]
Merge "Exposing activity type in targets so that we can handle home activity differently" into pi-dev am:
6dfad28bed
am:
d4445cadbd
Change-Id: I7f41f3d8fc8cb35ecda756b0fd21034e3e499493
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
Lucas Dupin [Fri, 13 Apr 2018 02:40:05 +0000 (19:40 -0700)]
Merge "Fix measurement of list with single item" into pi-dev am:
beefded4c7
am:
34ac9aa7f7
Change-Id: I9f382c343d725160c101d3dacda9120819801853
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
Aarthi Balachander [Fri, 13 Apr 2018 02:22:17 +0000 (19:22 -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
am:
9e3f9281fb
Change-Id: I188d19fbe2428b0146005b99cb8fa965a57c43eb
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)
Hansong Zhang [Fri, 13 Apr 2018 02:14:59 +0000 (19:14 -0700)]
Merge "Fix the null check in LocalBluetoothProfileManager" into pi-dev am:
3f9520e6f3
am:
8a6b5bb6f9
Change-Id: Ia3d6e133b79c5fc6aaab2558178e4c63556aed48
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
Yi Jin [Fri, 13 Apr 2018 02:04:55 +0000 (19:04 -0700)]
Merge "Add tests to cover handling negative varint." into pi-dev am:
9a58caaaff
am:
b15d1e362f
Change-Id: I09c952d4b2efc773605578c268e875884e5fb55a
Andrew Sapperstein [Fri, 13 Apr 2018 01:31:38 +0000 (18:31 -0700)]
[automerger skipped] Merge "Revert "Revert "Update material_deep_teal_500 to #008577.""" into pi-dev am:
d0fdef9229
am:
58bcc11ed1 -s ours
Change-Id: I62e01b85614094d55644dae81aea43418b417e91
Kweku Adams [Fri, 13 Apr 2018 01:26:44 +0000 (18:26 -0700)]
[automerger skipped] Merge "Adding privacy tags to graphicsstats proto." into pi-dev am:
8e97f6f86f
am:
ab4ad4a9b1 -s ours
Change-Id: I86ec60bfb45d100fe6bf6389e885466ed00370eb
Jovana Knezevic [Fri, 13 Apr 2018 01:15:37 +0000 (18:15 -0700)]
Merge "Fixing when the full-screen switcher appears." into pi-dev am:
4c5341c4b9
am:
1365666f0b
Change-Id: I12ef53895e7da75f416556af933e72e5abf1f02a
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
Nathan Harold [Fri, 13 Apr 2018 01:12:41 +0000 (18:12 -0700)]
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev am:
ade0186795
am:
b954b207d0
Change-Id: I565bcf163a1f23498781a0d8c23d3e4f619449ce
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
Julia Reynolds [Fri, 13 Apr 2018 00:48:07 +0000 (17:48 -0700)]
Merge "Fix volume panel shadows" into pi-dev am:
79634c7025
am:
aefa2f608f
Change-Id: If4ff44b3ec5e96d66f15f17204e0b3b60f2e8f73
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
Stanley Tng [Fri, 13 Apr 2018 00:31:18 +0000 (17:31 -0700)]
Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" into pi-dev am:
a85db7888e
am:
00fa45a494
Change-Id: Ic2c5da3b308fe7636fa68ef3ab5fe48fdf7a4166
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
TreeHugger Robot [Fri, 13 Apr 2018 00:26:12 +0000 (00:26 +0000)]
Merge "Updated UserIconDrawable#shouldUpdateColorFilter to return true if current ColorFilter was not an instance of PorterDuffColorFilter"
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
Jeff Sharkey [Fri, 13 Apr 2018 00:23:57 +0000 (17:23 -0700)]
Merge "Remove poorly defined notification APIs." into pi-dev am:
36efb71088
am:
d6e49befda
Change-Id: I6689556635b2ee8e56aca7325596e32efdc7311b
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
Selim Cinek [Fri, 13 Apr 2018 00:14:20 +0000 (17:14 -0700)]
Merge "Changed the appearance of phone call notifications" into pi-dev am:
e0a25acf08
am:
aab697426c
Change-Id: I0ca3ceadf4480b3d1524802d7c1ad0c60e1df2ec
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
Dongwon Kang [Thu, 12 Apr 2018 23:53:24 +0000 (16:53 -0700)]
Merge "Merge "Use system property to get the package name for media update" into pi-dev am:
fd3e190cbf" into pi-dev-plus-aosp
am:
8845722905
Change-Id: I36b09cf6b75932aa978c603c6d29ad0f87dad8e9
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:36:02 +0000 (16:36 -0700)]
Merge "Merge "Add method to get blocked app count" into pi-dev am:
5d1db91ecb" into pi-dev-plus-aosp
am:
8da08210e5
Change-Id: I6ed90f91926166b227b5b15b81855fa86d375d27
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
TreeHugger Robot [Thu, 12 Apr 2018 23:23:00 +0000 (23:23 +0000)]
Merge "Revert "Revert "Update material_deep_teal_500 to #008577.""" into pi-dev
Nader Jawad [Wed, 11 Apr 2018 17:41:10 +0000 (10:41 -0700)]
Updated UserIconDrawable#shouldUpdateColorFilter to return true if
current ColorFilter was not an instance of PorterDuffColorFilter
Fixed issue where UserIcondrawable#shouldUpdateColorFilter would
mistakenly return false if the current ColorFilter was not a
PorterDuffColor filter leading to color tints to not be applied if no
ColorFilter was applied previously.
Change-Id: I463932403723b2542cb79e4d996b5ffdc4c32f98
Fixes:
77907724
Test: Re-ran atest on UserIcondrawable
Stanley Tng [Thu, 12 Apr 2018 23:07:16 +0000 (16:07 -0700)]
Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" into pi-dev
am:
a85db7888e
Change-Id: I1acc2b875e58bb09b15d25a9b2a0ecbaa3f63c49
TreeHugger Robot [Thu, 12 Apr 2018 23:03:39 +0000 (23:03 +0000)]
Merge "Adding privacy tags to graphicsstats proto." into pi-dev
OSDN Git Service
