OSDN Git Service
Android Build Merger (Role) [Thu, 23 Jun 2016 03:13:09 +0000 (03:13 +0000)]
Merge "Merge \"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev am:
576e6d27bd" into nyc-mr1-dev
Dianne Hackborn [Thu, 23 Jun 2016 03:10:16 +0000 (03:10 +0000)]
Merge \"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
am:
576e6d27bd
Change-Id: Iaf58242c587cbfbc5a98a8083f29a9c7d6b6b940
TreeHugger Robot [Thu, 23 Jun 2016 03:10:05 +0000 (03:10 +0000)]
Merge "Notify user when application does not support current display zoom" into nyc-mr1-dev
Dianne Hackborn [Thu, 23 Jun 2016 03:04:25 +0000 (03:04 +0000)]
Merge "Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)" into nyc-dev
Ta-wei Yen [Thu, 23 Jun 2016 02:28:22 +0000 (02:28 +0000)]
Merge "Add more configuration state for visual voicemail" into nyc-mr1-dev
Andrii Kulian [Thu, 23 Jun 2016 02:27:25 +0000 (02:27 +0000)]
Merge \"Don\'t compare intent filters on singleTask adjacent launch\" into nyc-dev
am:
42147f0ff3
Change-Id: Ie767b54e2622a823d8e2fe2a864d788c3a81df74
TreeHugger Robot [Thu, 23 Jun 2016 02:17:23 +0000 (02:17 +0000)]
Merge "Don't compare intent filters on singleTask adjacent launch" into nyc-dev
Philip P. Moltmann [Thu, 23 Jun 2016 01:55:52 +0000 (01:55 +0000)]
Merge \"Do not launch non exposed add printer activity\" into nyc-dev
am:
737be111cc
Change-Id: Ief45b4a87071215700eaba8c21d0aff8ab0c8911
TreeHugger Robot [Thu, 23 Jun 2016 01:51:06 +0000 (01:51 +0000)]
Merge "Do not launch non exposed add printer activity" into nyc-dev
Yohei Yukawa [Thu, 23 Jun 2016 01:25:36 +0000 (01:25 +0000)]
Merge "Add InputMethodService#exposeContent()" into nyc-mr1-dev
TreeHugger Robot [Thu, 23 Jun 2016 01:21:08 +0000 (01:21 +0000)]
Merge "temporarily disable FakeSettingsProviderTest" into nyc-mr1-dev
Andrii Kulian [Thu, 23 Jun 2016 01:07:00 +0000 (01:07 +0000)]
Merge \"Show unsopported display size dialog on relaunch\" into nyc-dev
am:
354c8cde6c
Change-Id: I46f232290ebc5cf924bf696f20eb134076e83b4f
Andrii Kulian [Thu, 23 Jun 2016 01:00:35 +0000 (01:00 +0000)]
Merge "Show unsopported display size dialog on relaunch" into nyc-dev
Alan Viverette [Thu, 23 Jun 2016 01:00:32 +0000 (01:00 +0000)]
Merge \"Clarify docs for PopupWindow width/height parameters\" into nyc-dev
am:
22f887a014
Change-Id: I7311e8cb98da040148e961734646251949975270
Alan Viverette [Thu, 23 Jun 2016 00:55:51 +0000 (00:55 +0000)]
Merge "Clarify docs for PopupWindow width/height parameters" into nyc-dev
Ta-wei Yen [Thu, 23 Jun 2016 00:48:52 +0000 (17:48 -0700)]
Add more configuration state for visual voicemail
Bug:
26944391
Change-Id: I7e0c2649097edca96d6a78fe2dc250a4b4855133
Baligh Uddin [Thu, 23 Jun 2016 00:43:40 +0000 (00:43 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
b9aa9b47e7 -s ours
Change-Id: I6800e94bd8ca728af636dc0b46768bee708c6236
Baligh Uddin [Thu, 23 Jun 2016 00:40:01 +0000 (00:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Andrii Kulian [Thu, 23 Jun 2016 00:16:45 +0000 (17:16 -0700)]
Don't compare intent filters on singleTask adjacent launch
Bug:
29578845
Change-Id: Ic1614fc1f321e80ffdc2ab498d720657f393c239
Jim Miller [Thu, 23 Jun 2016 00:13:38 +0000 (00:13 +0000)]
Merge "Enable fingerprint sensor navigation to invoke QuickSettings - rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"" into nyc-mr1-dev
Dianne Hackborn [Wed, 22 Jun 2016 23:49:14 +0000 (16:49 -0700)]
Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)
I really have no idea how this can be happening (we check
for a null intent before posting the args), but add another
check before dispatching to try to avoid it.
Change-Id: Ic704850c9750b6a078c49ea628189be568031086
John Reck [Wed, 22 Jun 2016 23:45:34 +0000 (23:45 +0000)]
Merge \"Change approach for windowPositionLostRT\" into nyc-dev
am:
16038a0c5f
Change-Id: Ia6d1b8cfa2c5d126b702eb84895093fa3f893b00
Philip P. Moltmann [Wed, 22 Jun 2016 23:12:27 +0000 (16:12 -0700)]
Do not launch non exposed add printer activity
Change-Id: I0b9b11ea0ce0140c77dff2539b1a0a9dcf1558b0
Fixes:
29580579
John Reck [Wed, 22 Jun 2016 23:38:23 +0000 (23:38 +0000)]
Merge "Change approach for windowPositionLostRT" into nyc-dev
Baligh Uddin [Wed, 22 Jun 2016 23:33:07 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29322470
Change-Id: Iec697120d3e8b234bde18e0e37f02ad532796816
Yohei Yukawa [Wed, 22 Jun 2016 23:31:41 +0000 (16:31 -0700)]
Add InputMethodService#exposeContent()
This is a follow up CL to my previous CLs [1][2] that introduced
InputConnection#commitContent(InputContentInfo, Bundle) API to enable
IMEs to send a content to the target application.
With this CL, IME developers are able to temporarily expose
InputContentInfo object to the target package without permanently
granting URI permission. Although calling IMS#exposeContent() is
allowed only for the IME that is currently selected, the client is able
to request a temporary read-only access even after the current IME is
switched to any other IME as long as the client keeps InputContentInfo
object.
Here is a sample code snippet about how to use this mechanism.
[IME]
InputContentInfo contentInfo = new InputContentInfo(
contentUri,
new ClipDescription(description, new String[]{mimeType}),
linkUrl);
exposeContent(contentInfo, getCurrentInputEditorInfo());
getCurrentInputConnection().commitContent(inputContentInfo, null);
[App]
try {
contentInfo.requestPermission();
// Load inputContentInfo.getContentUri() here.
} finally {
contentInfo.releasePermission();
}
[1]: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
152944f4909c47917473293b258d266435c6ab35
[2]: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
adebb52588b098a1af678d4e33a234ef1ce783b2
Bug:
29450031
Change-Id: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
Guang Zhu [Wed, 22 Jun 2016 23:30:09 +0000 (16:30 -0700)]
temporarily disable FakeSettingsProviderTest
Bug:
29281167
Change-Id: I463d7707c197bd114de762c86e3b3e574d456e3b
John Reck [Wed, 22 Jun 2016 21:23:31 +0000 (14:23 -0700)]
Change approach for windowPositionLostRT
Bug:
29547000
Instead of shifting the window off screen fall
back to the UI-thread calculated values. This fixes
a race issue around tear-down where we stop
drawing long before our window is actually no longer
visible, as well as fixes a funky issue with
PRESERVE_GEOMETRY during first draw.
Change-Id: I792d1966f5aaee1e703295ae79166c723b97a1dc
Christopher Tate [Wed, 22 Jun 2016 23:05:05 +0000 (23:05 +0000)]
Merge \"Fix adb backup/restore\" into nyc-dev
am:
45c79447ad
Change-Id: Ieab601b2676f18f068280a9f5dfd8501fd5978f0
TreeHugger Robot [Wed, 22 Jun 2016 22:56:34 +0000 (22:56 +0000)]
Merge "Fix adb backup/restore" into nyc-dev
Phil Weaver [Wed, 22 Jun 2016 22:53:17 +0000 (22:53 +0000)]
Merge \"Report all content changes to a11y services.\" into nyc-dev
am:
8ac5bcbab2
Change-Id: I9338fd3ef749f80c4b0252c7c749fe6e395b3c0a
Phil Weaver [Wed, 22 Jun 2016 22:48:49 +0000 (22:48 +0000)]
Merge "Report all content changes to a11y services." into nyc-dev
Fyodor Kupolov [Wed, 22 Jun 2016 22:41:42 +0000 (22:41 +0000)]
Merge \"Use granted userId to look up provider info\" into nyc-dev
am:
f9f2c7ceef
Change-Id: Ifb6876fbb424632d3b47ec68686c01b56720b0a4
Adam Lesinski [Wed, 22 Jun 2016 22:41:38 +0000 (22:41 +0000)]
Merge \"Fix build due to missing abstract method impl\" into nyc-dev
am:
aeef7c4748
Change-Id: I38fc7c88e9c4ea5abf50a0bec5f2302c4622605f
Fyodor Kupolov [Wed, 22 Jun 2016 22:28:37 +0000 (22:28 +0000)]
Merge "Use granted userId to look up provider info" into nyc-dev
Adam Lesinski [Wed, 22 Jun 2016 22:20:54 +0000 (22:20 +0000)]
Merge "Fix build due to missing abstract method impl" into nyc-dev
Jim Miller [Wed, 22 Jun 2016 22:18:13 +0000 (15:18 -0700)]
Enable fingerprint sensor navigation to invoke QuickSettings
- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"
Fixes bug
28869612
Change-Id: I321240ee54506633d63a29e987b8d8638c652391
Andrii Kulian [Wed, 22 Jun 2016 21:49:58 +0000 (14:49 -0700)]
Show unsopported display size dialog on relaunch
If the display density change made app restart when it was focused
or we navigate back to it after density change and it makes it
restart - we didn't display unsupported display size dialog.
Bug:
29574686
Change-Id: Ic8fdc8a54df160f947e2d340ab2cb2931bac195d
Roozbeh Pournader [Wed, 22 Jun 2016 21:20:42 +0000 (21:20 +0000)]
Merge "Don't match locales with different scripts in ResourceFilter" into nyc-mr1-dev
Robert Greenwalt [Wed, 22 Jun 2016 21:12:14 +0000 (21:12 +0000)]
Merge "Add a Carrier-config specific ratcheter of RATs." into nyc-mr1-dev
Christopher Tate [Fri, 17 Jun 2016 20:24:02 +0000 (13:24 -0700)]
Fix adb backup/restore
* Exclude key/value-only backup participants until we have a chance to
augment the archive format with proper handling.
* Don't back up 'stopped' apps, which would un-stop them
* Fix unspecified-user bindService/startActivity invocations
* Teach adb restore about the onRestoreFinished() lifecycle method
* Implement proper app timeout handling in the adb data flows
* Backstop wallpaper backup against rare leftover-state issues
Bug
28056941
Change-Id: Ia59c71a2c74a632a2c2a527b9b7374229c440d46
Felipe Leme [Wed, 22 Jun 2016 20:45:54 +0000 (20:45 +0000)]
Merge \"Fixed whitelistManager assignment.\" into nyc-dev
am:
dea7aa0da1
Change-Id: I3ba91e222cf0a04e2a08bbefc7d0aeea20485bcb
TreeHugger Robot [Wed, 22 Jun 2016 20:40:19 +0000 (20:40 +0000)]
Merge "Fixed whitelistManager assignment." into nyc-dev
Jeff Sharkey [Wed, 22 Jun 2016 20:14:45 +0000 (20:14 +0000)]
Merge \"Avoid runtime restart when storage is missing.\" into nyc-dev
am:
18553f5f73
Change-Id: I9303aa177f25f27db7090bf2464218d690aaeafe
Adam Lesinski [Wed, 22 Jun 2016 20:11:40 +0000 (13:11 -0700)]
Fix build due to missing abstract method impl
getDisplay() was added to Context, which needs to be implemented
for BridgeContext.
Bug:
28388969
Change-Id: I7b0ffcbbe252403e35f08d3fa40d6b0e4dbf0daa
TreeHugger Robot [Wed, 22 Jun 2016 20:08:17 +0000 (20:08 +0000)]
Merge "Avoid runtime restart when storage is missing." into nyc-dev
Lifu Tang [Wed, 22 Jun 2016 19:56:30 +0000 (19:56 +0000)]
Merge \"Added more logs to track WakeLock usages\" into nyc-dev
am:
335387a1df
Change-Id: I1383a36b05e50d7a20e477f70c5c8f64ce36041c
Lifu Tang [Wed, 22 Jun 2016 19:50:47 +0000 (19:50 +0000)]
Merge "Added more logs to track WakeLock usages" into nyc-dev
Phil Weaver [Mon, 20 Jun 2016 18:54:59 +0000 (11:54 -0700)]
Report all content changes to a11y services.
Changes were discarded if they arrived too quickly in
A11yManagerService. Excuse content change events from
throttling at this level.
Bug:
29355115
Change-Id: Ifd9da07315ce0c18f59c1dad6a621110ad48343b
Adam Lesinski [Wed, 22 Jun 2016 19:16:44 +0000 (19:16 +0000)]
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am:
0bf31c3fa6
Change-Id: Id0d16d2f9d69b87d4b4c01370eeceafe329d1817
Adam Lesinski [Wed, 22 Jun 2016 19:11:34 +0000 (19:11 +0000)]
Merge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev
smain@google.com [Wed, 22 Jun 2016 18:52:41 +0000 (18:52 +0000)]
Merge \\\"Move conceptual test info into \\\"Getting Started with Testing\\\" and move the procedural information into the corresponding guides for creating unit tests.\\\" into mnc-io-docs am:
8af7a89820 am:
359b8cd443
am:
9802883bb3
Change-Id: I72640ba34ea604639cd7da7a2cae4fabcfa98dbb
Scott Main [Wed, 22 Jun 2016 18:49:25 +0000 (18:49 +0000)]
Merge \\"Move conceptual test info into \\"Getting Started with Testing\\" and move the procedural information into the corresponding guides for creating unit tests.\\" into mnc-io-docs am:
8af7a89820
am:
359b8cd443
Change-Id: I91ac419c6c7778b0e357719e1822fe1f6adfe0c3
smain@google.com [Wed, 22 Jun 2016 18:42:27 +0000 (18:42 +0000)]
Merge \"Move conceptual test info into \"Getting Started with Testing\" and move the procedural information into the corresponding guides for creating unit tests.\" into mnc-io-docs
am:
8af7a89820
Change-Id: I7d153a79fa01b2b35540e3fe1e965a99201110f0
Jeff Sharkey [Wed, 22 Jun 2016 18:41:18 +0000 (18:41 +0000)]
Merge \"Start primary storage move outside lock.\" into nyc-dev
am:
a3290363e1
Change-Id: Idac9cb8408687f580910fe784802da1b584ade85
Scott Main [Wed, 22 Jun 2016 18:37:10 +0000 (18:37 +0000)]
Merge "Move conceptual test info into "Getting Started with Testing" and move the procedural information into the corresponding guides for creating unit tests." into mnc-io-docs
Jeff Sharkey [Wed, 22 Jun 2016 16:35:29 +0000 (10:35 -0600)]
Avoid runtime restart when storage is missing.
When primary shared storage is completely missing, catch the thrown
exception and treat as if ejected.
Bug:
29461637
Change-Id: I8eb5cdeb01983efbf26da3d32ab19a6630662156
TreeHugger Robot [Wed, 22 Jun 2016 18:36:06 +0000 (18:36 +0000)]
Merge "Start primary storage move outside lock." into nyc-dev
Robert Greenwalt [Thu, 9 Jun 2016 23:28:40 +0000 (16:28 -0700)]
Add a Carrier-config specific ratcheter of RATs.
Only reports transitions to higher RATs within a given family.
Reset when we move to a new cell.
Avoids costly propogation of RAT flapping within the family,
for example every outgoing data pops us into a higher RAT and
idle time pops us back down.
bug:
27360321
Change-Id: I549d79c1c74325981bee284cef452bd096184d86
smain@google.com [Tue, 14 Jun 2016 18:37:19 +0000 (11:37 -0700)]
Move conceptual test info into "Getting Started with Testing" and
move the procedural information into the corresponding guides for creating
unit tests.
This is part of a cleanup for the Android Studio test docs, simplifying the
amount of content covered with Android Studio to be strictly how to create
and run tests. Bug:
28470079
Related: https://critique.corp.google.com/#review/
125115510
Change-Id: I8b9590045b42a03c618e7011e0c3741aede77cd8
Felipe Leme [Tue, 21 Jun 2016 22:33:43 +0000 (15:33 -0700)]
Fixed whitelistManager assignment.
It must be set before looping through all app services...
Fixes:
29480440
Change-Id: I38f78255ea44f00ea4226010d334b94fb4baadb4
Lifu Tang [Wed, 22 Jun 2016 17:57:55 +0000 (10:57 -0700)]
Added more logs to track WakeLock usages
Bug:
28829595
Change-Id: I607745a27e830e42300ee307412e57c2254bff55
TreeHugger Robot [Wed, 22 Jun 2016 17:40:46 +0000 (17:40 +0000)]
Merge changes from topic 'seamless-rotation' into nyc-mr1-dev
* changes:
Enable resize during relayout fix for all stacks.
SurfaceView: Careful with FLAG_PRESERVE_GEOMETRY.
Implement seamless rotation mode.
Adam Lesinski [Wed, 22 Jun 2016 17:37:41 +0000 (17:37 +0000)]
Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev
am:
ec6db57ac7
Change-Id: Id0327572c549eff30dfe0a8fd70007bcaccf7a32
smain@google.com [Wed, 22 Jun 2016 17:37:36 +0000 (17:37 +0000)]
add direct path to sdk manager docs for studio UI help button bug:
28982864
am:
31b49837a1
Change-Id: Ia44cb1d0084e3d4d05bae0081a97d7c533340132
Adam Lesinski [Wed, 22 Jun 2016 17:31:34 +0000 (17:31 +0000)]
Merge "Prevent early boot crash reading PowerProfile" into nyc-dev
Fyodor Kupolov [Mon, 20 Jun 2016 21:03:44 +0000 (14:03 -0700)]
Use granted userId to look up provider info
In getPersistedUriPermissions, use granted userId instead of the calling
userId to look up provider info.
Bug:
29058113
Change-Id: Ia637be414f9ef3b8e9bce13bb56bd335cfb28ac7
smain@google.com [Wed, 22 Jun 2016 17:29:06 +0000 (17:29 +0000)]
Merge \"add redirect for old link to publishing docs\" into nyc-dev
am:
7bb456d6c5
Change-Id: I8760984a4686cd44a659408efcd9ead9ccd8893e
Adam Lesinski [Wed, 22 Jun 2016 17:28:47 +0000 (10:28 -0700)]
Prevent early boot crash reading PowerProfile
The PowerProfile in BatteryStatsImpl may not be ready when
resetting stats early in the boot sequence.
Bug:
29559031
Change-Id: I51bba762231a08804f1b68505bb1b0523476081d
smain@google.com [Wed, 22 Jun 2016 17:28:02 +0000 (10:28 -0700)]
add direct path to sdk manager docs for studio UI help button
bug:
28982864
Change-Id: I4186de00d0a80e54066dd209d55ecf1348a30337
Chong Zhang [Wed, 22 Jun 2016 17:24:17 +0000 (17:24 +0000)]
Merge \"Unblock \'am start -W\' if activity is brought to front without launching\" into nyc-dev
am:
75c7cc6ca9
Change-Id: I983331f65f03d50c26b7929866e3ce5d5ae19966
Scott Main [Wed, 22 Jun 2016 17:22:42 +0000 (17:22 +0000)]
Merge "add redirect for old link to publishing docs" into nyc-dev
Dianne Hackborn [Wed, 22 Jun 2016 17:18:29 +0000 (17:18 +0000)]
Merge \"Fix issue #
29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
am:
a62a7eef24
Change-Id: Ieb9435479b727da5ea3ce5f512b43986898675fd
Chong Zhang [Wed, 22 Jun 2016 17:17:47 +0000 (17:17 +0000)]
Merge "Unblock 'am start -W' if activity is brought to front without launching" into nyc-dev
Dianne Hackborn [Wed, 22 Jun 2016 17:12:07 +0000 (17:12 +0000)]
Merge "Fix issue #
29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag..." into nyc-dev
Mady Mellor [Wed, 22 Jun 2016 16:54:08 +0000 (16:54 +0000)]
Merge \"Don\'t show the shade background for heads up notifications\" into nyc-dev
am:
6b6bf9cd54
Change-Id: Ic6d8f5c1d1a8eed8e0bc9657c11c77890cd64e7c
Jason Monk [Wed, 22 Jun 2016 16:54:06 +0000 (16:54 +0000)]
Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
am:
126088536d
Change-Id: I7e8ee5c59d7f26dcbc2406a53c0c6c39a9d8f55e
Todd Kennedy [Wed, 22 Jun 2016 16:54:04 +0000 (16:54 +0000)]
Merge \"Update prebuilts from build server\" into nyc-dev
am:
4001d7b6c4
Change-Id: Iad86c2ca001ccd821affb334e455f7d901cf4265
Mady Mellor [Wed, 22 Jun 2016 16:49:40 +0000 (16:49 +0000)]
Merge "Don't show the shade background for heads up notifications" into nyc-dev
Julia Reynolds [Wed, 22 Jun 2016 16:48:20 +0000 (16:48 +0000)]
Don\'t iterate over a list items are removed from.
am:
00d9d9f11e
Change-Id: I83350895e2f6f0ee575a80e4207fb579c86c12e5
TreeHugger Robot [Wed, 22 Jun 2016 16:47:30 +0000 (16:47 +0000)]
Merge "QS Tiles: Fix some problems with connecting through intent" into nyc-dev
Todd Kennedy [Wed, 22 Jun 2016 16:46:02 +0000 (16:46 +0000)]
Merge "Update prebuilts from build server" into nyc-dev
Todd Kennedy [Mon, 20 Jun 2016 22:34:57 +0000 (15:34 -0700)]
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
Julia Reynolds [Tue, 21 Jun 2016 11:47:22 +0000 (07:47 -0400)]
Don't iterate over a list items are removed from.
Change-Id: I896cd4578da15e21d422ca8db42e34bbd10912e8
Fixes:
29512540
Jeff Sharkey [Wed, 22 Jun 2016 15:04:33 +0000 (09:04 -0600)]
Start primary storage move outside lock.
Otherwise there is a potential deadlock when an unsolicited event
arrives from vold while we're still waiting for the move operation
to be processed.
The safe fix here is to kick off the move after dropping the lock.
Bug:
29501052
Change-Id: I2160c6a7a19c1d9981c692a2be2b04019352db2e
Jason Monk [Wed, 22 Jun 2016 15:44:07 +0000 (15:44 +0000)]
Merge \"QS: Fix default icon handling for services\" into nyc-dev
am:
94a20367b5
Change-Id: I626992cdd9c5ff507b001dae2816df09872872ca
Sid Soundararajan [Wed, 22 Jun 2016 15:44:04 +0000 (15:44 +0000)]
Merge \"Blacklist ATV Remote Service to never appear on Recents\" into nyc-dev
am:
8f41c074c7
Change-Id: I37f6ec8e48300996db4603de455b0e74a481ae3a
Jason Monk [Wed, 22 Jun 2016 15:39:29 +0000 (15:39 +0000)]
Merge "QS: Fix default icon handling for services" into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 15:36:09 +0000 (15:36 +0000)]
Merge "Blacklist ATV Remote Service to never appear on Recents" into nyc-dev
Jason Monk [Tue, 21 Jun 2016 22:23:13 +0000 (18:23 -0400)]
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
Jason Monk [Wed, 22 Jun 2016 13:58:46 +0000 (09:58 -0400)]
QS: Fix default icon handling for services
Change-Id: I3b25df8b8d02cd99a943571de14cf0a8c5b051bd
Fixes:
29452288
Yoshinori Hirano [Wed, 22 Jun 2016 13:30:09 +0000 (13:30 +0000)]
Merge \"Restrict hotspot qs tile to admin user\" into nyc-dev
am:
ba568a46e6
Change-Id: Ifb7a835ab6633a97a5be32f8b6a699d0c75dde9a
Jason Monk [Wed, 22 Jun 2016 13:30:06 +0000 (13:30 +0000)]
Merge \"QS Edit: Try to simplify drag logic\" into nyc-dev
am:
3a0241566b
Change-Id: I9b080743a60d247c63293274759cbca313d7ca05
Jason Monk [Wed, 22 Jun 2016 13:23:25 +0000 (13:23 +0000)]
Merge "Restrict hotspot qs tile to admin user" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:23:16 +0000 (13:23 +0000)]
Merge "QS Edit: Try to simplify drag logic" into nyc-dev
Nicolas Prevot [Wed, 22 Jun 2016 12:33:41 +0000 (12:33 +0000)]
Merge \"Don\'t allow showing an activity if user is stopping or shutting down.\" into nyc-dev
am:
2058553b8d
Change-Id: Ie6995527fb31b9b5f0c272726c80754927770c55
Nicolas Prévot [Wed, 22 Jun 2016 12:27:12 +0000 (12:27 +0000)]
Merge "Don't allow showing an activity if user is stopping or shutting down." into nyc-dev
Nicolas Prevot [Mon, 20 Jun 2016 16:25:12 +0000 (17:25 +0100)]
Don't allow showing an activity if user is stopping or shutting down.
BUG:
29264996
Change-Id: I9fc97c5dc37e6d5656b82b277954b5963eb345c4
Dianne Hackborn [Wed, 22 Jun 2016 03:39:02 +0000 (20:39 -0700)]
Fix issue #
29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...
...isn't respected if previous job was scheduled with same URI
Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139
Chong Zhang [Tue, 21 Jun 2016 23:31:37 +0000 (16:31 -0700)]
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
afb776d5447e19565c9a826a554911decb9ed92a,
since it's causing problems with launch time reporting.
bug:
28333487
bug:
29451567
Change-Id: I9fd79ab5b3ed8f9de5df34ed9c7b0be3a94620b2