OSDN Git Service
Adrian Roos [Fri, 15 Jul 2016 23:25:31 +0000 (23:25 +0000)]
Merge \\"Doze: Add config for fine grained proximity checks\\" into nyc-mr1-dev am:
4ba23f30b5
am:
e0cac111db
Change-Id: Iff1af5e273af306190539a91fed0876f19b38888
Adrian Roos [Fri, 15 Jul 2016 23:25:27 +0000 (23:25 +0000)]
Merge \\"Notification: Apply small icon level\\" into nyc-mr1-dev am:
9d8de73530
am:
8b942b2404
Change-Id: I8471581ac27fb1c35126635bdc655b8c8ddea328
Adrian Roos [Fri, 15 Jul 2016 23:25:19 +0000 (23:25 +0000)]
Merge \\"Add way to set live wallpaper across users\\" into nyc-mr1-dev am:
9a7c3bd577
am:
119840eb91
Change-Id: I16436af5b7ada58113d846b9836d302061730177
Dan Yu [Fri, 15 Jul 2016 23:14:04 +0000 (23:14 +0000)]
Merge \"Merge \\\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\\" into nyc-dev am:
344a7375d7 am:
d5b43852dc\" into nyc-mr1-dev-plus-aosp
am:
dbf1504128
Change-Id: Iacb23044e44049877b76e7a07426161f5a0a95f9
Daniel Yu [Fri, 15 Jul 2016 23:14:01 +0000 (23:14 +0000)]
Merge \\\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\\" into nyc-dev am:
344a7375d7 am:
7b10126ed6
am:
79b1bb4878
Change-Id: I014bece8c337e4997866668af8964cc76cd5d6cd
Svetoslav Ganov [Fri, 15 Jul 2016 23:13:59 +0000 (23:13 +0000)]
Merge \\"Prevent apps to overlay other apps via toast windows\\" into nyc-mr1-dev am:
e2d148b008
am:
cd263d56d2
Change-Id: I4971baf5ef2a522f8acea091023936e033f23cea
Jason Monk [Fri, 15 Jul 2016 23:13:56 +0000 (23:13 +0000)]
Merge \\"Reduce contention of ApplicationsState locks\\" into nyc-mr1-dev am:
9e133205e3
am:
b3bbcf256f
Change-Id: I15b3cd0e2690ad1c9f5bc04afc3224dd771d7ae0
Vineeta Srivastava [Fri, 15 Jul 2016 23:13:43 +0000 (23:13 +0000)]
Merge \\"Add carrier config to report IMEI on CDMA phone.\\" into nyc-mr1-dev am:
a5b923bdd7
am:
199290cdab
Change-Id: Ia4f53257e352b3f71810582867258ec318cf47d6
Fan Zhang [Fri, 15 Jul 2016 23:06:24 +0000 (23:06 +0000)]
Merge "resolve merge conflicts of
b9d34b3 to master"
Ben Lin [Fri, 15 Jul 2016 22:56:43 +0000 (22:56 +0000)]
Merge "Fix a crash happening on a context menu."
Fan Zhang [Fri, 15 Jul 2016 21:21:47 +0000 (14:21 -0700)]
resolve merge conflicts of
b9d34b3 to master
Change-Id: Id88ecf373378f9ed7c18a3d2d84ab419dd033891
Adrian Roos [Fri, 15 Jul 2016 21:16:49 +0000 (21:16 +0000)]
Merge \"Doze: Add config for fine grained proximity checks\" into nyc-mr1-dev
am:
4ba23f30b5
Change-Id: Ibd911a479877fe6e944fcd421807c052fa05df70
Adrian Roos [Fri, 15 Jul 2016 21:16:41 +0000 (21:16 +0000)]
Merge \"Notification: Apply small icon level\" into nyc-mr1-dev
am:
9d8de73530
Change-Id: Iac5f0b6e210355867f79cbc7f48165517ba11a26
Adrian Roos [Fri, 15 Jul 2016 21:16:36 +0000 (21:16 +0000)]
Merge \"Add way to set live wallpaper across users\" into nyc-mr1-dev
am:
9a7c3bd577
Change-Id: Ia5630143df774d76d5867e8e9541775e07e1c5df
Adrian Roos [Fri, 15 Jul 2016 21:09:50 +0000 (21:09 +0000)]
Merge "Doze: Add config for fine grained proximity checks" into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 21:09:36 +0000 (21:09 +0000)]
Merge "Notification: Apply small icon level" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 21:07:30 +0000 (21:07 +0000)]
Merge "Add way to set live wallpaper across users" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 20:42:15 +0000 (20:42 +0000)]
Merge "Remove vestigial config setting."
Kevin Hufnagle [Fri, 15 Jul 2016 20:30:22 +0000 (20:30 +0000)]
Merge \\\"docs: Added note about limited support for hardware key attestation\\\" into nyc-dev am:
68b98bc608 am:
6198b6cdfb
am:
ed5ce4a792
Change-Id: I1f1f767781c93166cb085ebaed32036aee367f05
Kevin Hufnagle [Fri, 15 Jul 2016 20:19:23 +0000 (20:19 +0000)]
Merge \\\"docs: Added note about limited support for hardware key attestation\\\" into nyc-dev am:
68b98bc608 am:
6198b6cdfb
am:
eb6124cbaf
Change-Id: I424b5a33d00437e9092e3aa681d9b5fa5524dd63
Vladislav Kaznacheev [Fri, 15 Jul 2016 20:19:20 +0000 (20:19 +0000)]
Merge \\"Always return valid ClipDescription for ACTION_DRAG_EXITED\\" into nyc-mr1-dev am:
278676bdeb
am:
b604ade452
Change-Id: Ie779f0a6ca15f6f190a6361bddc4982b522004cd
Chong Zhang [Fri, 15 Jul 2016 20:19:18 +0000 (20:19 +0000)]
Merge \\"Don\\'t release surface if relayout is visible\\" into nyc-mr1-dev am:
465376c5ae
am:
8e8c07cd2e
Change-Id: Icbd15f921c450c4951f6cfaa345c1746e560600c
Adrian Roos [Fri, 15 Jul 2016 20:19:15 +0000 (20:19 +0000)]
Merge \\"Add ApplicationErrorReport tests\\" into nyc-mr1-dev am:
f86d855125
am:
4b39cfe203
Change-Id: I6510e4bb75e0780baef8e7a80622d8bbad9a932a
Ruben Brunk [Fri, 15 Jul 2016 20:19:12 +0000 (20:19 +0000)]
Merge \\"Remove VR package disable logic.\\" into nyc-mr1-dev am:
b005e0685f
am:
b983261885
Change-Id: I49e7e868ea5ca1db3ba6efba25027ecb3874f6e5
Android Build Merger (Role) [Fri, 15 Jul 2016 20:17:35 +0000 (20:17 +0000)]
Merge "Merge \\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\" into nyc-dev am:
344a7375d7 am:
d5b43852dc" into nyc-mr1-dev-plus-aosp
Dan Yu [Fri, 15 Jul 2016 20:17:01 +0000 (20:17 +0000)]
Merge \\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\" into nyc-dev am:
344a7375d7
am:
d5b43852dc
Change-Id: I54158112da7872a7968cd4661c4f321ca459c9db
Chris Tate [Fri, 15 Jul 2016 20:16:53 +0000 (20:16 +0000)]
Merge \\"Turn down restore-time logspam\\" into nyc-mr1-dev am:
a46b7f44c0
am:
c577b1be52
Change-Id: I86397a6cc792bbcf7c3c86e720446093f630aca7
Bert McMeen [Fri, 15 Jul 2016 20:16:50 +0000 (20:16 +0000)]
Merge \"Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d am:
5c7a3e4867\" into nyc-mr1-dev-plus-aosp
am:
0a7063a2a0
Change-Id: I3542cbbd52bf1bf21d7209a5292d4b68268243ef
Bert McMeen [Fri, 15 Jul 2016 20:16:47 +0000 (20:16 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d am:
e6430efbcf
am:
9b6a7ee515
Change-Id: I3b0d0a63146f2919236737ec4ac8811240068518
Jason Monk [Fri, 15 Jul 2016 20:16:44 +0000 (20:16 +0000)]
Merge \\"QS: Don\\'t use ComponentName to identify tiles\\" into nyc-mr1-dev am:
a0967ebbdf
am:
356d4914b2
Change-Id: I83fad6237edfb9516e1fe40612b820c319f26cc5
Esteban Talavera [Fri, 15 Jul 2016 20:16:39 +0000 (20:16 +0000)]
Merge \\"Disallow user to block notification from OobConfig\\" into nyc-mr1-dev am:
28763c5a77
am:
65aeef9d87
Change-Id: I466d5bbf617e50f85ef3b63564ee1945f64710f2
Dan Yu [Fri, 15 Jul 2016 20:15:40 +0000 (20:15 +0000)]
Merge \\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\" into nyc-dev am:
344a7375d7
am:
7b10126ed6
Change-Id: I3e28ba70ad33d32b293c9f11b5a5110e0e8a5fc7
Daniel Yu [Fri, 15 Jul 2016 20:09:41 +0000 (20:09 +0000)]
Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev
am:
344a7375d7
Change-Id: Ia090eda73ad984c7e15a94c9b318e3a314fe0582
Daniel Yu [Fri, 15 Jul 2016 20:09:34 +0000 (20:09 +0000)]
Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev
am:
344a7375d7
Change-Id: I9f05ab3452788942b6fc3e0d45ed92e0e5401ea6
Jason Monk [Fri, 15 Jul 2016 20:08:39 +0000 (20:08 +0000)]
Merge "resolve merge conflicts of
4481b51 to master"
Svet Ganov [Fri, 15 Jul 2016 20:03:33 +0000 (20:03 +0000)]
Merge \"Prevent apps to overlay other apps via toast windows\" into nyc-mr1-dev
am:
e2d148b008
Change-Id: I73f802b9b1c4acd5b17c706372f42c9e5d388840
Dan Yu [Fri, 15 Jul 2016 19:59:56 +0000 (19:59 +0000)]
Merge "docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5" into nyc-dev
Svetoslav Ganov [Fri, 15 Jul 2016 19:56:41 +0000 (19:56 +0000)]
Merge "Prevent apps to overlay other apps via toast windows" into nyc-mr1-dev
Jason Monk [Fri, 15 Jul 2016 19:55:45 +0000 (19:55 +0000)]
Merge \"Reduce contention of ApplicationsState locks\" into nyc-mr1-dev
am:
9e133205e3
Change-Id: I3ac7fca652b60ebc66e8804e31c8cfd034b8b037
TreeHugger Robot [Fri, 15 Jul 2016 19:52:08 +0000 (19:52 +0000)]
Merge "Reduce contention of ApplicationsState locks" into nyc-mr1-dev
Junda Liu [Fri, 15 Jul 2016 19:50:46 +0000 (19:50 +0000)]
Merge \"Add carrier config to report IMEI on CDMA phone.\" into nyc-mr1-dev
am:
a5b923bdd7
Change-Id: I383718bd1e756f560485b12259f6a5c98dc8a8f6
Vineeta Srivastava [Fri, 15 Jul 2016 19:44:44 +0000 (19:44 +0000)]
Merge "Add carrier config to report IMEI on CDMA phone." into nyc-mr1-dev
Chad Brubaker [Fri, 15 Jul 2016 19:33:12 +0000 (19:33 +0000)]
Merge "Mention target API limits for ACTION_STORAGE_CHANGED"
Steve McKay [Fri, 15 Jul 2016 19:21:43 +0000 (12:21 -0700)]
Remove vestigial config setting.
Change-Id: I8cd1558ae76833d4f0e511f05fc6e66d9ff44a7e
Kevin Hufnagle [Fri, 15 Jul 2016 19:12:28 +0000 (19:12 +0000)]
Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am:
68b98bc608
am:
7703ce2d21
Change-Id: I1ec301fa937ef74193667f43891d8e0e09737dfd
TreeHugger Robot [Fri, 15 Jul 2016 19:08:10 +0000 (19:08 +0000)]
Merge "Align empty views for quicksetting center in detail panel." into nyc-mr1-dev
Android Build Merger (Role) [Fri, 15 Jul 2016 19:07:01 +0000 (19:07 +0000)]
Merge "Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am:
68b98bc608 am:
ca5c7da9d0" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Fri, 15 Jul 2016 19:06:38 +0000 (19:06 +0000)]
Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am:
68b98bc608
am:
ca5c7da9d0
Change-Id: I36f43c1094d90cf531c0d12b6b24a2d00236b0db
Kevin Hufnagle [Fri, 15 Jul 2016 19:06:23 +0000 (19:06 +0000)]
Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am:
68b98bc608
am:
6198b6cdfb
Change-Id: Icce0f6f456fddc098597b7f656db368733250583
Adam Lesinski [Fri, 15 Jul 2016 19:06:10 +0000 (19:06 +0000)]
Merge "Build SystemUI and Keyguard with AAPT2"
Junda Liu [Thu, 14 Jul 2016 20:55:03 +0000 (13:55 -0700)]
Add carrier config to report IMEI on CDMA phone.
Bug: b/
29340579
Change-Id: I3cac49af4b173f971b8153c00227141378f32b43
Kevin Hufnagle [Fri, 15 Jul 2016 18:58:07 +0000 (18:58 +0000)]
Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev
am:
68b98bc608
Change-Id: I1ae42e82f830ac939491c7d754d71420ec2092d9
Kevin Hufnagle [Fri, 15 Jul 2016 18:56:32 +0000 (18:56 +0000)]
Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev
am:
68b98bc608
Change-Id: I07e7c0a91f7e75d5713b93aa27c06ef2631ea276
Kevin Hufnagle [Fri, 15 Jul 2016 18:44:09 +0000 (18:44 +0000)]
Merge "docs: Added note about limited support for hardware key attestation" into nyc-dev
Daniel Yu [Wed, 13 Jul 2016 19:12:59 +0000 (12:12 -0700)]
docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus()
and Direct Boot for DP5
getStorageEncryptionStatus() now returns new
ENCRYPTION_STATUS_ACTIVE_PER_USER if the device is not
using direct boot (and the not-new ENCRYPTION_STATUS_ACTIVE
is returned if direct boot is used)
Bug:
30112425
Change-Id: I27c11b2afe2afd9a19c9f8268f486b09af22e6ac
Vladislav Kaznacheev [Fri, 15 Jul 2016 18:38:08 +0000 (18:38 +0000)]
Merge \"Always return valid ClipDescription for ACTION_DRAG_EXITED\" into nyc-mr1-dev
am:
278676bdeb
Change-Id: I51a339a1a821439b5c90079812aea56833872b75
Chong Zhang [Fri, 15 Jul 2016 18:37:59 +0000 (18:37 +0000)]
Merge \"Don\'t release surface if relayout is visible\" into nyc-mr1-dev
am:
465376c5ae
Change-Id: I47d834d26cee248900d268bbe027ea82fd7c286a
Adrian Roos [Fri, 15 Jul 2016 18:31:20 +0000 (18:31 +0000)]
Merge \"Add ApplicationErrorReport tests\" into nyc-mr1-dev
am:
f86d855125
Change-Id: I57d00e200ebf03010fca4ae0753200b981faaad4
TreeHugger Robot [Fri, 15 Jul 2016 18:26:50 +0000 (18:26 +0000)]
Merge "Always return valid ClipDescription for ACTION_DRAG_EXITED" into nyc-mr1-dev
Chong Zhang [Fri, 15 Jul 2016 18:26:27 +0000 (18:26 +0000)]
Merge "Don't release surface if relayout is visible" into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 18:24:27 +0000 (18:24 +0000)]
Merge "Add ApplicationErrorReport tests" into nyc-mr1-dev
Adrian Roos [Thu, 14 Jul 2016 21:19:55 +0000 (14:19 -0700)]
Add way to set live wallpaper across users
Also adds an entry point for vendor specific services
to SystemUI.
Bug:
30038484
Change-Id: I8f335c1f7de15d619f2c688a8ac95372f166595f
Ben Lin [Thu, 14 Jul 2016 17:40:00 +0000 (10:40 -0700)]
Fix a crash happening on a context menu.
When an activity gets a callback for onContextItemSelected, it first
gets dibs on handling it, and then it propagates the call to -every-
fragment it is tied to. This poses a problem since RootsFragment and
DirectoryFragment don't necessarily handle each other's menu items well,
which can cause NPEs. This is some temporary fix for it.
Bug:
30092676
Change-Id: I3f268c9c9580504b78581ad92a24c9a99c4a0daf
(cherry picked from commit
3e1699f3a3f3d0378d758e3b0d430165867eb89e)
Ruben Brunk [Fri, 15 Jul 2016 18:15:42 +0000 (18:15 +0000)]
Merge \"Remove VR package disable logic.\" into nyc-mr1-dev
am:
b005e0685f
Change-Id: I0ee90e535d49ee04e6e26048e6e72e15b44fad17
Ruben Brunk [Fri, 15 Jul 2016 18:09:34 +0000 (18:09 +0000)]
Merge "Remove VR package disable logic." into nyc-mr1-dev
Christopher Tate [Fri, 15 Jul 2016 18:08:57 +0000 (18:08 +0000)]
Merge \"Turn down restore-time logspam\" into nyc-mr1-dev
am:
a46b7f44c0
Change-Id: Ied38c22902590f12044aa010b0573e4bc3dbc11e
Chris Tate [Fri, 15 Jul 2016 18:05:06 +0000 (18:05 +0000)]
Merge "Turn down restore-time logspam" into nyc-mr1-dev
Christopher Tate [Fri, 15 Jul 2016 17:53:15 +0000 (10:53 -0700)]
Turn down restore-time logspam
Bug
30160827
Change-Id: I14ccf0a31e5a6882bf189c28c79d1c139ec44bcc
Jason Monk [Fri, 15 Jul 2016 17:54:42 +0000 (13:54 -0400)]
Reduce contention of ApplicationsState locks
Change-Id: I5b2ad52b014eea5bdf77526554eb10f4ba303105
Fixes:
30113789
Fan Zhang [Fri, 15 Jul 2016 17:39:03 +0000 (10:39 -0700)]
Align empty views for quicksetting center in detail panel.
Change-Id: I6d0f1eaeee1ea59890cf0589381332a3f3a8fb4e
Fixes:
29981651
Android Build Merger (Role) [Fri, 15 Jul 2016 17:26:17 +0000 (17:26 +0000)]
Merge "Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d am:
5c7a3e4867" into nyc-mr1-dev-plus-aosp
Bert McMeen [Fri, 15 Jul 2016 17:25:53 +0000 (17:25 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d
am:
5c7a3e4867
Change-Id: Ic2330a5ebfff87285b2f68a02c2450d2e2f9355b
Bert McMeen [Fri, 15 Jul 2016 17:25:39 +0000 (17:25 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d
am:
e6430efbcf
Change-Id: I7c7e23d1a79bf7fa252dc59b8317be932fbd9e5d
Bert McMeen [Fri, 15 Jul 2016 17:19:44 +0000 (17:19 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c
am:
8432d4328d
Change-Id: I8eff2a07e0cfc07a407607a4e064b3c130f2ab48
Bert McMeen [Fri, 15 Jul 2016 17:19:42 +0000 (17:19 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c
am:
8432d4328d
Change-Id: I65edec2172b347df56a4be699060bd456cfe3923
Bert McMeen [Fri, 15 Jul 2016 17:14:06 +0000 (17:14 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51
am:
274d904d4c
Change-Id: I2bf5f981b7b8b001ce3d25ff0179270e23d08588
Bert McMeen [Fri, 15 Jul 2016 17:08:31 +0000 (17:08 +0000)]
Docs: Behavior changes such as activity dismissal
am:
f506485b51
Change-Id: Ia133aef14f006a15304ca744d933eb8934c80bb5
Jason Monk [Fri, 15 Jul 2016 17:03:46 +0000 (17:03 +0000)]
Merge \"QS: Don\'t use ComponentName to identify tiles\" into nyc-mr1-dev
am:
a0967ebbdf
Change-Id: Ib98a48e46f711b927a1b9e8d2b8162a59bfa3240
Jason Monk [Fri, 15 Jul 2016 16:55:22 +0000 (16:55 +0000)]
Merge "QS: Don't use ComponentName to identify tiles" into nyc-mr1-dev
Etan Cohen [Fri, 15 Jul 2016 16:52:06 +0000 (16:52 +0000)]
[NAN] NAN System Api: RTT
am:
ab9ef45971
Change-Id: I34039caac1a40a2c26d8a89d5a0d938fa5a4af62
Jason Monk [Fri, 15 Jul 2016 16:32:33 +0000 (12:32 -0400)]
resolve merge conflicts of
4481b51 to master
Change-Id: I97489764bfe30507120b65e5e996aa4409435488
Tony Mak [Fri, 15 Jul 2016 16:20:45 +0000 (16:20 +0000)]
Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
am:
28763c5a77
Change-Id: Ie03835fd81e997e9feafe83ba50e6e4d9f10c820
Esteban Talavera [Fri, 15 Jul 2016 16:14:20 +0000 (16:14 +0000)]
Merge "Disallow user to block notification from OobConfig" into nyc-mr1-dev
Jason Monk [Fri, 15 Jul 2016 16:12:00 +0000 (16:12 +0000)]
Merge \"QS Detail: Don\'t animate switch before panel open\" into nyc-mr1-dev
am:
9716690e2f
Change-Id: If807c7c7e08103c882af67b5539cfbc8fd96505e
TreeHugger Robot [Fri, 15 Jul 2016 16:04:17 +0000 (16:04 +0000)]
Merge "QS Detail: Don't animate switch before panel open" into nyc-mr1-dev
Pankaj Kanwar [Fri, 15 Jul 2016 15:23:35 +0000 (15:23 +0000)]
Merge \\"Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.\\" into nyc-mr1-dev am:
9e73d82336
am:
933e5f9f87
Change-Id: I42509be5aaf59525014f09b4dad81dc4811d5b69
Tyler Gunn [Fri, 15 Jul 2016 15:18:07 +0000 (15:18 +0000)]
Merge \"Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.\" into nyc-mr1-dev
am:
9e73d82336
Change-Id: Idd57c35f04193ab1157e455f4c4242e30c9ea7a2
Pankaj Kanwar [Fri, 15 Jul 2016 15:10:26 +0000 (15:10 +0000)]
Merge "Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems." into nyc-mr1-dev
Julia Reynolds [Fri, 15 Jul 2016 14:51:53 +0000 (14:51 +0000)]
Merge \"Merge \\\\\\\"Check caller\\\\\\\'s uid before allowing notification policy access.\\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72 am:
837696131e\" into nyc-mr1-dev-plus-aosp
am:
38e88e249e
Change-Id: Ib4313f8eb0a0171bdfb1d8fc55f5678181c25686
Julia Reynolds [Fri, 15 Jul 2016 14:44:55 +0000 (14:44 +0000)]
Merge \\\\\\\"Check caller\\\\\\\'s uid before allowing notification policy access.\\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72 am:
d59fc3a5c9
am:
a109154633
Change-Id: I95f7fd04b4b81c51a36878212badfa3e8820fb92
Android Build Merger (Role) [Fri, 15 Jul 2016 14:41:34 +0000 (14:41 +0000)]
Merge "Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72 am:
837696131e" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 15 Jul 2016 14:41:06 +0000 (14:41 +0000)]
Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72
am:
837696131e
Change-Id: I76348913cc4d0905edb3badc45883bb4d14645ee
Julia Reynolds [Fri, 15 Jul 2016 14:41:05 +0000 (14:41 +0000)]
Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72
am:
d59fc3a5c9
Change-Id: I1fa80e1f61ac3e2a8d929261d56334f715a6a377
Jason Monk [Fri, 15 Jul 2016 14:37:07 +0000 (10:37 -0400)]
QS Detail: Don't animate switch before panel open
This will make it more obvious that wifi gets turned on by opening
the panel as the animation of the state change will be visible.
Change-Id: I6ceb0bef914a9ff368b1bdb750d19aeb43593e78
Fixes:
29057528
Julia Reynolds [Fri, 15 Jul 2016 14:34:21 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I0d01f75f3ba19142675de8c589071af9888deeab
Julia Reynolds [Fri, 15 Jul 2016 14:34:14 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I10e3412be1a534f5511f72da63ea7581cab21140
Julia Reynolds [Fri, 15 Jul 2016 14:27:24 +0000 (14:27 +0000)]
Merge \\\\"Check caller\\\\'s uid before allowing notification policy access.\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89
am:
e1d8b98189 -s ours
Change-Id: I583fa066aaf12cacb841b10f751ad0ad7a1de237
Julia Reynolds [Fri, 15 Jul 2016 14:17:56 +0000 (14:17 +0000)]
Merge \\\"Check caller\\\'s uid before allowing notification policy access.\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c
am:
5c6db3af89
Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519
Julia Reynolds [Fri, 15 Jul 2016 14:12:23 +0000 (14:12 +0000)]
Merge \\"Check caller\\'s uid before allowing notification policy access.\\" into mnc-dev am:
234e1c25e4
am:
8e8bb6633c
Change-Id: Ic36dbb69f0eeddd85b17579b2fc90f75349e4ca3
Julia Reynolds [Fri, 15 Jul 2016 14:06:49 +0000 (14:06 +0000)]
Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev
am:
234e1c25e4
Change-Id: I6724832d28362a76cd2f65432d6e805738f335fa
OSDN Git Service
