smain@google.com
183287c96d
add direct path to sdk manager docs for studio UI help button bug: 28982864
...
am: 31b49837a1
2016-06-22 17:37:36 +00:00
smain@google.com
cf51c3941e
Merge \"add redirect for old link to publishing docs\" into nyc-dev
...
am: 7bb456d6c5
2016-06-22 17:29:06 +00:00
smain@google.com
31b49837a1
add direct path to sdk manager docs for studio UI help button
...
bug: 28982864
Change-Id: I4186de00d0a80e54066dd209d55ecf1348a30337
2016-06-22 10:28:02 -07:00
Chong Zhang
6098085aba
Merge \"Unblock \'am start -W\' if activity is brought to front without launching\" into nyc-dev
...
am: 75c7cc6ca9
2016-06-22 17:24:17 +00:00
Scott Main
7bb456d6c5
Merge "add redirect for old link to publishing docs" into nyc-dev
2016-06-22 17:22:45 +00:00
Dianne Hackborn
3f19c95ec5
Merge \"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
...
am: a62a7eef24
2016-06-22 17:18:29 +00:00
Chong Zhang
75c7cc6ca9
Merge "Unblock 'am start -W' if activity is brought to front without launching" into nyc-dev
2016-06-22 17:17:48 +00:00
Dianne Hackborn
a62a7eef24
Merge "Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag..." into nyc-dev
2016-06-22 17:12:09 +00:00
Mady Mellor
f56bcc7925
Merge \"Don\'t show the shade background for heads up notifications\" into nyc-dev
...
am: 6b6bf9cd54
2016-06-22 16:54:08 +00:00
Jason Monk
a5076ef7fa
Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
...
am: 126088536d
2016-06-22 16:54:06 +00:00
Todd Kennedy
164e2a2520
Merge \"Update prebuilts from build server\" into nyc-dev
...
am: 4001d7b6c4
2016-06-22 16:54:04 +00:00
Mady Mellor
6b6bf9cd54
Merge "Don't show the shade background for heads up notifications" into nyc-dev
2016-06-22 16:49:42 +00:00
Julia Reynolds
d25b0c6285
Don\'t iterate over a list items are removed from.
...
am: 00d9d9f11e
2016-06-22 16:48:20 +00:00
TreeHugger Robot
126088536d
Merge "QS Tiles: Fix some problems with connecting through intent" into nyc-dev
2016-06-22 16:47:33 +00:00
Todd Kennedy
4001d7b6c4
Merge "Update prebuilts from build server" into nyc-dev
2016-06-22 16:46:04 +00:00
Todd Kennedy
356fe48224
Update prebuilts from build server
...
CtsShim.apk
versionCode='24' versionName='7.0-2996264'
CtsShimPriv.apk
versionCode='24' versionName='7.0-2996264'
Built here:
https://android-build.googleplex.com/builds/submitted/2996264/CtsShim/latest
This build is suitable for public release.
Bug: 29122339
Change-Id: I6533e3a3ed72de6d3887039e3e8cf527947c4166
2016-06-22 09:39:49 -07:00
Julia Reynolds
00d9d9f11e
Don't iterate over a list items are removed from.
...
Change-Id: I896cd4578da15e21d422ca8db42e34bbd10912e8
Fixes: 29512540
2016-06-22 16:34:06 +00:00
Jason Monk
726aee885a
Merge \"QS: Fix default icon handling for services\" into nyc-dev
...
am: 94a20367b5
2016-06-22 15:44:07 +00:00
Sid Soundararajan
542762f99d
Merge \"Blacklist ATV Remote Service to never appear on Recents\" into nyc-dev
...
am: 8f41c074c7
2016-06-22 15:44:04 +00:00
Jason Monk
94a20367b5
Merge "QS: Fix default icon handling for services" into nyc-dev
2016-06-22 15:39:32 +00:00
TreeHugger Robot
8f41c074c7
Merge "Blacklist ATV Remote Service to never appear on Recents" into nyc-dev
2016-06-22 15:36:11 +00:00
Jason Monk
8753e184f9
QS Tiles: Fix some problems with connecting through intent
...
- Don't send Tile through intent, it can cause crashes
- Clean up other issues surrounding this
Change-Id: I08c626cf39b36d349592c1e0b81627b9bc7eeeb3
Fixes: 29519485
2016-06-22 10:52:58 -04:00
Jason Monk
a5f6ed355e
QS: Fix default icon handling for services
...
Change-Id: I3b25df8b8d02cd99a943571de14cf0a8c5b051bd
Fixes: 29452288
2016-06-22 10:00:38 -04:00
Yoshinori Hirano
045fd29c75
Merge \"Restrict hotspot qs tile to admin user\" into nyc-dev
...
am: ba568a46e6
2016-06-22 13:30:09 +00:00
Jason Monk
aeba74427f
Merge \"QS Edit: Try to simplify drag logic\" into nyc-dev
...
am: 3a0241566b
2016-06-22 13:30:06 +00:00
Jason Monk
ba568a46e6
Merge "Restrict hotspot qs tile to admin user" into nyc-dev
2016-06-22 13:23:30 +00:00
Jason Monk
3a0241566b
Merge "QS Edit: Try to simplify drag logic" into nyc-dev
2016-06-22 13:23:18 +00:00
Nicolas Prevot
f5cf319dc9
Merge \"Don\'t allow showing an activity if user is stopping or shutting down.\" into nyc-dev
...
am: 2058553b8d
2016-06-22 12:33:41 +00:00
Nicolas Prévot
2058553b8d
Merge "Don't allow showing an activity if user is stopping or shutting down." into nyc-dev
2016-06-22 12:27:14 +00:00
Nicolas Prevot
1219c924bd
Don't allow showing an activity if user is stopping or shutting down.
...
BUG:29264996
Change-Id: I9fc97c5dc37e6d5656b82b277954b5963eb345c4
2016-06-22 10:21:16 +01:00
Dianne Hackborn
121e1645d1
Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...
...
...isn't respected if previous job was scheduled with same URI
Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139
2016-06-21 20:39:02 -07:00
Chong Zhang
5022da313f
Unblock 'am start -W' if activity is brought to front without launching
...
If -W is used to start an activity successfully, but this activity just
brings another activity to front without actual launching, the waiting
will be stuck because neither activity will report launch complete.
In this case, we have to treat it as if the -W started an activity and
received return code START_TASK_TO_FRONT. It needs to wait for the new
activity to become visible (or report launch complete if it's already
visible).
This reverts earlier commits afb776d544
2016-06-21 19:44:09 -07:00
TreeHugger Robot
30ec4f2732
Merge "Guard concurrent accesses to BluetoothA2dp service object" into nyc-mr1-dev
2016-06-22 02:31:36 +00:00
Todd Kennedy
4504b0e40c
Merge \"Revert \"Parse \"vendor/priv-app\" to find privileged applications\"\" into nyc-dev
...
am: c211539769
2016-06-22 01:25:21 +00:00
Eric Laurent
c5e3f9b539
Merge \"Fix JAVA doc for AudioRecord and AudioTrack Builder\" into nyc-dev
...
am: 34ed8ad3c2
2016-06-22 01:17:44 +00:00
TreeHugger Robot
c211539769
Merge "Revert "Parse "vendor/priv-app" to find privileged applications"" into nyc-dev
2016-06-22 01:13:56 +00:00
Eric Laurent
34ed8ad3c2
Merge "Fix JAVA doc for AudioRecord and AudioTrack Builder" into nyc-dev
2016-06-22 01:08:45 +00:00
Calvin On
d7d16b9f37
Guard concurrent accesses to BluetoothA2dp service object
...
This fixes potential NPEs that happen on methods that access
mService after checking nullness, i.e. getConnectedDevices.
Bug: 29514788
Change-Id: Ic97054fd5a3563a374c0e863fb116c52535a6509
2016-06-22 01:08:03 +00:00
Dirk Dougherty
b0b781abc5
Merge \"Doc change: remove common images from localized directories.\" into nyc-dev
...
am: cdb7434140
2016-06-22 00:52:59 +00:00
Adrian Roos
8985d16a56
Merge \"Notification: Respect disabled HUNs on updates\" into nyc-dev
...
am: 394cc084f9
2016-06-22 00:52:56 +00:00
Doris Liu
41fb30282e
Merge "Make sure VD animation push staging happens only in MODE_FULL" into nyc-mr1-dev
2016-06-22 00:40:49 +00:00
Dirk Dougherty
cdb7434140
Merge "Doc change: remove common images from localized directories." into nyc-dev
2016-06-22 00:38:27 +00:00
TreeHugger Robot
394cc084f9
Merge "Notification: Respect disabled HUNs on updates" into nyc-dev
2016-06-22 00:35:30 +00:00
Paul Stewart
72abb6a42e
Merge "Fix invitation request from persistent GC" into nyc-mr1-dev
2016-06-22 00:19:24 +00:00
Adrian Roos
9a3b3953c1
Merge \"Fix stale transformations\" into nyc-dev
...
am: ea16efd52c
2016-06-21 23:56:54 +00:00
Sudheer Shanka
44f24379cf
Merge \\\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc -s ours am: e01775f0be am: 5e41f90a92 am: 80e720742b am: 565d13f17e -s ours
...
am: e4e424d80d
2016-06-21 23:56:51 +00:00
Sudheer Shanka
e8af546d37
Merge \\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254 -s ours am: 199f6a490a am: 06c3f60136 am: 9088be4ebe am: 95c9bef53b -s ours
...
am: 00e79982aa
2016-06-21 23:56:49 +00:00
Sudheer Shanka
45c9f542e7
Merge \\\\\"Add pm operation to set user restrictions.\\\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837 am: 916728bb35 am: 4e8aa0f35f -s ours
...
am: b0de5fd328
2016-06-21 23:56:46 +00:00
Sudheer Shanka
25d2682bef
Merge \\\\\"Reduce shell power over user management.\\\\\" into mnc-dev am: 964500fd43 am: 9bfa0ad22f am: fb87ae59b0 am: 63e8198685 -s ours
...
am: a5e89439ff
2016-06-21 23:40:26 +00:00
Selim Cinek
0864de19f6
Merge \"Do animations correctly in systemUI\" into nyc-dev
...
am: afa0f25379
2016-06-21 23:40:24 +00:00
