Junda Liu
199290cdab
Merge \"Add carrier config to report IMEI on CDMA phone.\" into nyc-mr1-dev
...
am: a5b923bdd7
Change-Id: I383718bd1e756f560485b12259f6a5c98dc8a8f6
2016-07-15 19:50:46 +00:00
Vineeta Srivastava
a5b923bdd7
Merge "Add carrier config to report IMEI on CDMA phone." into nyc-mr1-dev
2016-07-15 19:44:45 +00:00
Kevin Hufnagle
b9d34b3877
Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am: 68b98bc608
...
am: 7703ce2d21
Change-Id: I1ec301fa937ef74193667f43891d8e0e09737dfd
2016-07-15 19:12:28 +00:00
TreeHugger Robot
7703ce2d21
Merge "Align empty views for quicksetting center in detail panel." into nyc-mr1-dev
2016-07-15 19:08:12 +00:00
Android Build Merger (Role)
ed5ce4a792
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
2016-07-15 19:07:02 +00:00
Kevin Hufnagle
8bee543a16
Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am: 68b98bc608
...
am: ca5c7da9d0
Change-Id: I36f43c1094d90cf531c0d12b6b24a2d00236b0db
2016-07-15 19:06:38 +00:00
Kevin Hufnagle
eb6124cbaf
Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am: 68b98bc608
...
am: 6198b6cdfb
Change-Id: Icce0f6f456fddc098597b7f656db368733250583
2016-07-15 19:06:23 +00:00
Junda Liu
276f4d648b
Add carrier config to report IMEI on CDMA phone.
...
Bug: b/29340579
Change-Id: I3cac49af4b173f971b8153c00227141378f32b43
2016-07-15 12:04:24 -07:00
Kevin Hufnagle
ca5c7da9d0
Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev
...
am: 68b98bc608
Change-Id: I1ae42e82f830ac939491c7d754d71420ec2092d9
2016-07-15 18:58:07 +00:00
Kevin Hufnagle
6198b6cdfb
Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev
...
am: 68b98bc608
Change-Id: I07e7c0a91f7e75d5713b93aa27c06ef2631ea276
2016-07-15 18:56:32 +00:00
Kevin Hufnagle
68b98bc608
Merge "docs: Added note about limited support for hardware key attestation" into nyc-dev
2016-07-15 18:44:12 +00:00
Vladislav Kaznacheev
b604ade452
Merge \"Always return valid ClipDescription for ACTION_DRAG_EXITED\" into nyc-mr1-dev
...
am: 278676bdeb
Change-Id: I51a339a1a821439b5c90079812aea56833872b75
2016-07-15 18:38:08 +00:00
Chong Zhang
8e8c07cd2e
Merge \"Don\'t release surface if relayout is visible\" into nyc-mr1-dev
...
am: 465376c5ae
Change-Id: I47d834d26cee248900d268bbe027ea82fd7c286a
2016-07-15 18:37:59 +00:00
Adrian Roos
4b39cfe203
Merge \"Add ApplicationErrorReport tests\" into nyc-mr1-dev
...
am: f86d855125
Change-Id: I57d00e200ebf03010fca4ae0753200b981faaad4
2016-07-15 18:31:20 +00:00
TreeHugger Robot
278676bdeb
Merge "Always return valid ClipDescription for ACTION_DRAG_EXITED" into nyc-mr1-dev
2016-07-15 18:26:51 +00:00
Chong Zhang
465376c5ae
Merge "Don't release surface if relayout is visible" into nyc-mr1-dev
2016-07-15 18:26:28 +00:00
Adrian Roos
f86d855125
Merge "Add ApplicationErrorReport tests" into nyc-mr1-dev
2016-07-15 18:24:28 +00:00
Ruben Brunk
b983261885
Merge \"Remove VR package disable logic.\" into nyc-mr1-dev
...
am: b005e0685f
Change-Id: I0ee90e535d49ee04e6e26048e6e72e15b44fad17
2016-07-15 18:15:42 +00:00
Ruben Brunk
b005e0685f
Merge "Remove VR package disable logic." into nyc-mr1-dev
2016-07-15 18:09:36 +00:00
Christopher Tate
c577b1be52
Merge \"Turn down restore-time logspam\" into nyc-mr1-dev
...
am: a46b7f44c0
Change-Id: Ied38c22902590f12044aa010b0573e4bc3dbc11e
2016-07-15 18:08:57 +00:00
Chris Tate
a46b7f44c0
Merge "Turn down restore-time logspam" into nyc-mr1-dev
2016-07-15 18:05:07 +00:00
Christopher Tate
4c307258ac
Turn down restore-time logspam
...
Bug 30160827
Change-Id: I14ccf0a31e5a6882bf189c28c79d1c139ec44bcc
2016-07-15 10:56:05 -07:00
Fan Zhang
3bfda445f7
Align empty views for quicksetting center in detail panel.
...
Change-Id: I6d0f1eaeee1ea59890cf0589381332a3f3a8fb4e
Fixes: 29981651
2016-07-15 10:45:22 -07:00
Android Build Merger (Role)
0a7063a2a0
Merge "Docs: Behavior changes such as activity dismissal am: f506485b51 am: 274d904d4c am: 8432d4328d am: 5c7a3e4867" into nyc-mr1-dev-plus-aosp
2016-07-15 17:26:19 +00:00
Bert McMeen
0e93408b22
Docs: Behavior changes such as activity dismissal am: f506485b51 am: 274d904d4c am: 8432d4328d
...
am: 5c7a3e4867
Change-Id: Ic2330a5ebfff87285b2f68a02c2450d2e2f9355b
2016-07-15 17:25:53 +00:00
Bert McMeen
9b6a7ee515
Docs: Behavior changes such as activity dismissal am: f506485b51 am: 274d904d4c am: 8432d4328d
...
am: e6430efbcf
Change-Id: I7c7e23d1a79bf7fa252dc59b8317be932fbd9e5d
2016-07-15 17:25:39 +00:00
Bert McMeen
5c7a3e4867
Docs: Behavior changes such as activity dismissal am: f506485b51 am: 274d904d4c
...
am: 8432d4328d
Change-Id: I8eff2a07e0cfc07a407607a4e064b3c130f2ab48
2016-07-15 17:19:44 +00:00
Bert McMeen
e6430efbcf
Docs: Behavior changes such as activity dismissal am: f506485b51 am: 274d904d4c
...
am: 8432d4328d
Change-Id: I65edec2172b347df56a4be699060bd456cfe3923
2016-07-15 17:19:42 +00:00
Bert McMeen
8432d4328d
Docs: Behavior changes such as activity dismissal am: f506485b51
...
am: 274d904d4c
Change-Id: I2bf5f981b7b8b001ce3d25ff0179270e23d08588
2016-07-15 17:14:06 +00:00
Bert McMeen
274d904d4c
Docs: Behavior changes such as activity dismissal
...
am: f506485b51
Change-Id: Ia133aef14f006a15304ca744d933eb8934c80bb5
2016-07-15 17:08:31 +00:00
Jason Monk
356d4914b2
Merge \"QS: Don\'t use ComponentName to identify tiles\" into nyc-mr1-dev
...
am: a0967ebbdf
Change-Id: Ib98a48e46f711b927a1b9e8d2b8162a59bfa3240
2016-07-15 17:03:46 +00:00
Jason Monk
a0967ebbdf
Merge "QS: Don't use ComponentName to identify tiles" into nyc-mr1-dev
2016-07-15 16:55:23 +00:00
Tony Mak
65aeef9d87
Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
...
am: 28763c5a77
Change-Id: Ie03835fd81e997e9feafe83ba50e6e4d9f10c820
2016-07-15 16:20:45 +00:00
Esteban Talavera
28763c5a77
Merge "Disallow user to block notification from OobConfig" into nyc-mr1-dev
2016-07-15 16:14:22 +00:00
Jason Monk
4481b51667
Merge \"QS Detail: Don\'t animate switch before panel open\" into nyc-mr1-dev
...
am: 9716690e2f
Change-Id: If807c7c7e08103c882af67b5539cfbc8fd96505e
2016-07-15 16:12:00 +00:00
TreeHugger Robot
9716690e2f
Merge "QS Detail: Don't animate switch before panel open" into nyc-mr1-dev
2016-07-15 16:04:19 +00:00
Tyler Gunn
933e5f9f87
Merge \"Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.\" into nyc-mr1-dev
...
am: 9e73d82336
Change-Id: Idd57c35f04193ab1157e455f4c4242e30c9ea7a2
2016-07-15 15:18:07 +00:00
Pankaj Kanwar
9e73d82336
Merge "Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems." into nyc-mr1-dev
2016-07-15 15:10:27 +00:00
Android Build Merger (Role)
38e88e249e
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
2016-07-15 14:41:36 +00:00
Julia Reynolds
45848371c3
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
2016-07-15 14:41:06 +00:00
Julia Reynolds
a109154633
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
2016-07-15 14:41:05 +00:00
Jason Monk
48e093e6df
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
2016-07-15 10:40:44 -04:00
Julia Reynolds
837696131e
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
2016-07-15 14:34:21 +00:00
Julia Reynolds
d59fc3a5c9
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
2016-07-15 14:34:14 +00:00
Julia Reynolds
8e6b7c2f72
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
2016-07-15 14:27:24 +00:00
Julia Reynolds
e1d8b98189
Merge \\\"Check caller\\\'s uid before allowing notification policy access.\\\" into mnc-dev am: 234e1c25e4 am: 8e8bb6633c
...
am: 5c6db3af89
Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519
2016-07-15 14:17:56 +00:00
Julia Reynolds
5c6db3af89
Merge \\"Check caller\\'s uid before allowing notification policy access.\\" into mnc-dev am: 234e1c25e4
...
am: 8e8bb6633c
Change-Id: Ic36dbb69f0eeddd85b17579b2fc90f75349e4ca3
2016-07-15 14:12:23 +00:00
Julia Reynolds
8e8bb6633c
Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev
...
am: 234e1c25e4
Change-Id: I6724832d28362a76cd2f65432d6e805738f335fa
2016-07-15 14:06:49 +00:00
Julia Reynolds
234e1c25e4
Merge "Check caller's uid before allowing notification policy access." into mnc-dev
2016-07-15 13:59:06 +00:00
Ricky Wai
39cfbde069
Merge \"Remove tied profile encryption key cache in keystore\" into nyc-mr1-dev
...
am: 3ed2a52bb1
Change-Id: I127bb8329b374e57147b42f13f699b3125872367
2016-07-15 10:18:36 +00:00