OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Do a forceLayout if pending insets is changed after relayout window\" into...
Chong Zhang [Sat, 18 Jun 2016 02:07:55 +0000 (02:07 +0000)]
Merge \"Do a forceLayout if pending insets is changed after relayout window\" into nyc-dev
am: 2756d0707f

Change-Id: I72a8192317ebaa7c036416a65b415c2471f449de

8 years agoMerge \"Fix shade background not aligning with bottom of a group\" into nyc-dev
Mady Mellor [Sat, 18 Jun 2016 02:07:53 +0000 (02:07 +0000)]
Merge \"Fix shade background not aligning with bottom of a group\" into nyc-dev
am: 4f9404f6f2

Change-Id: Id157e63ed4950f422b7cfefbbb2c4a589a70dd3d

8 years agoMerge \"Bring out your toggles\" into nyc-dev
Jason Monk [Sat, 18 Jun 2016 02:07:51 +0000 (02:07 +0000)]
Merge \"Bring out your toggles\" into nyc-dev
am: 3aee783837

Change-Id: I4e069cd88bc154e7636fcc9fed739d5fedd604a4

8 years agoMerge \"Do not schedule restarts if the system is shutting down\" into nyc-dev
Fyodor Kupolov [Sat, 18 Jun 2016 02:07:49 +0000 (02:07 +0000)]
Merge \"Do not schedule restarts if the system is shutting down\" into nyc-dev
am: 1f0151220e

Change-Id: I34df39f82516cb0e40c12a25340a7b3bb2c5f65a

8 years agoMerge \"Call AppOpsService from the handler thread\" into nyc-dev
Fyodor Kupolov [Sat, 18 Jun 2016 02:07:47 +0000 (02:07 +0000)]
Merge \"Call AppOpsService from the handler thread\" into nyc-dev
am: 1347cdb2e1

Change-Id: Ia3adf0e08a7612c39b6e2e040c1bde2efb46dea9

8 years agoMerge \"Notify user when application does not support current display zoom\" into...
Alan Viverette [Sat, 18 Jun 2016 02:05:10 +0000 (02:05 +0000)]
Merge \"Notify user when application does not support current display zoom\" into nyc-dev
am: c577a50d09  -s ours

Change-Id: I1d43ee5ecd627edd952979e300253de3c49f2218

8 years agoMerge "Refactored unnecessary calls to updateRulesForGlobalChangeLocked()." into...
TreeHugger Robot [Sat, 18 Jun 2016 01:35:18 +0000 (01:35 +0000)]
Merge "Refactored unnecessary calls to updateRulesForGlobalChangeLocked()." into nyc-mr1-dev

8 years agoMerge "Catch throwable exceptions." into nyc-mr1-dev
TreeHugger Robot [Sat, 18 Jun 2016 00:26:42 +0000 (00:26 +0000)]
Merge "Catch throwable exceptions." into nyc-mr1-dev

8 years agoMerge "remove Intent.FLAG_ACTIVITY_NEW_TASK flag check" into nyc-mr1-dev
Wei Wang [Sat, 18 Jun 2016 00:19:40 +0000 (00:19 +0000)]
Merge "remove Intent.FLAG_ACTIVITY_NEW_TASK flag check" into nyc-mr1-dev

8 years agoMerge "API Rename: IC#inputContent to IC#commitContent." into nyc-mr1-dev
Yohei Yukawa [Fri, 17 Jun 2016 23:23:56 +0000 (23:23 +0000)]
Merge "API Rename: IC#inputContent to IC#commitContent." into nyc-mr1-dev

8 years agoCatch throwable exceptions.
Christopher Ferris [Fri, 17 Jun 2016 22:29:58 +0000 (15:29 -0700)]
Catch throwable exceptions.

If the zygote dies early enough, certain exceptions disappear and never
result in an error message in the log. Fix the code to catch all
Throwable exceptions so that an error message does not result in a
silent restart of the zygote.

Bug: 29400363
Change-Id: Ib044006629ea4441728921f3c587d0cb295ec745

8 years agoMerge "Update manifest shortcut XML schema" into nyc-mr1-dev
Makoto Onuki [Fri, 17 Jun 2016 20:29:37 +0000 (20:29 +0000)]
Merge "Update manifest shortcut XML schema" into nyc-mr1-dev

8 years agoMerge "Add metrics for new tabs in Settings." into nyc-mr1-dev
Fan Zhang [Fri, 17 Jun 2016 20:15:46 +0000 (20:15 +0000)]
Merge "Add metrics for new tabs in Settings." into nyc-mr1-dev

8 years agoMerge "Move SurfaceView offscreen if the app stops drawing it" into nyc-mr1-dev
John Reck [Fri, 17 Jun 2016 20:13:19 +0000 (20:13 +0000)]
Merge "Move SurfaceView offscreen if the app stops drawing it" into nyc-mr1-dev

8 years agoUpdate manifest shortcut XML schema
Makoto Onuki [Thu, 16 Jun 2016 16:51:40 +0000 (09:51 -0700)]
Update manifest shortcut XML schema

Use the standard <intent> tag instead of custom tags.

- Also fix setDynamicShortcuts(), which was broken in the previous CL.
- Also tolerate runtime exceptions while parsing XMLs
- Also fix b/29422018 while I'm at it

Bug 29390156
Bug 29077932
Bug 29422018

Change-Id: I2756c9d66c6d7b2962a982d9e57a7d84a5755b28

8 years agoMerge "Do a forceLayout if pending insets is changed after relayout window" into...
Chong Zhang [Fri, 17 Jun 2016 18:22:29 +0000 (18:22 +0000)]
Merge "Do a forceLayout if pending insets is changed after relayout window" into nyc-dev

8 years agoMerge "Modify TelephonyHistogram.java functions." into nyc-mr1-dev
Sanket Padawe [Fri, 17 Jun 2016 17:24:12 +0000 (17:24 +0000)]
Merge "Modify TelephonyHistogram.java functions." into nyc-mr1-dev

8 years agoMove SurfaceView offscreen if the app stops drawing it
John Reck [Thu, 16 Jun 2016 22:36:13 +0000 (15:36 -0700)]
Move SurfaceView offscreen if the app stops drawing it

Bug: 29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906

8 years agoMerge "Fix shade background not aligning with bottom of a group" into nyc-dev
Mady Mellor [Fri, 17 Jun 2016 17:22:34 +0000 (17:22 +0000)]
Merge "Fix shade background not aligning with bottom of a group" into nyc-dev

8 years agoMerge "Bring out your toggles" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 17:22:01 +0000 (17:22 +0000)]
Merge "Bring out your toggles" into nyc-dev

8 years agoAPI Rename: IC#inputContent to IC#commitContent.
Yohei Yukawa [Fri, 17 Jun 2016 17:10:39 +0000 (10:10 -0700)]
API Rename: IC#inputContent to IC#commitContent.

As shown in below, we have already used commit* naming convention in
InputConnection.

 - InputConnection#commitCompletion(CompletionInfo);
 - InputConnection#commitCorrection(CorrectionInfo);
 - InputConnection#commitText(CharSequence, int);

Hence renaming IC#inputContent() to IC#commitContent() would make the
new method more consistent.

Bug: 29450024
Change-Id: Ica1ba3154795c1bf44e140dfe639b299f83cd8af

8 years agoMerge \"Allow stopping user to access AppWidgetService API\" into nyc-dev
Tony Mak [Fri, 17 Jun 2016 17:09:22 +0000 (17:09 +0000)]
Merge \"Allow stopping user to access AppWidgetService API\" into nyc-dev
am: ab8d4cf645

Change-Id: I2280fae9d85594ad0fde5d552ff07b0d4e0c6158

8 years agoDO NOT MERGE: Don\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent...
Christopher Tate [Fri, 17 Jun 2016 17:09:16 +0000 (17:09 +0000)]
DO NOT MERGE: Don\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours am: 41821a26a5  -s ours am: b1e31ad140 am: 918fb5d453 am: 2149ebeadf  -s ours am: c61f35ed9a am: 34fb87b519 am: 1a450675f3 am: 790c87a05b  -s ours
am: 02435d2419

Change-Id: I97b8993491e9a7441177f9d521f9971cf2c155a5

8 years agoresolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b...
Christopher Tate [Fri, 17 Jun 2016 17:09:13 +0000 (17:09 +0000)]
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
am: 1c3be1a5b1

Change-Id: If72735aeb86874e3d672a9567f03fecdb9ed00eb

8 years agoMerge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
Adrian Roos [Fri, 17 Jun 2016 17:09:01 +0000 (17:09 +0000)]
Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
am: a66746d167

Change-Id: If3724770b370b83c3de9e30a0c917d4ad1bc72d5

8 years agoMerge "Do not schedule restarts if the system is shutting down" into nyc-dev
Fyodor Kupolov [Fri, 17 Jun 2016 16:01:09 +0000 (16:01 +0000)]
Merge "Do not schedule restarts if the system is shutting down" into nyc-dev

8 years agoMerge "Call AppOpsService from the handler thread" into nyc-dev
Fyodor Kupolov [Fri, 17 Jun 2016 15:59:06 +0000 (15:59 +0000)]
Merge "Call AppOpsService from the handler thread" into nyc-dev

8 years agoBring out your toggles
Jason Monk [Fri, 17 Jun 2016 14:19:43 +0000 (10:19 -0400)]
Bring out your toggles

Switch Wifi and BT back to toggling from QQS.  Make cell open a
detail panel.

Change-Id: Ibdd8fa52a31c4bf81ee0e6974e263b46b6f71a31
Fixes: 29406644

8 years agoMerge "Notify user when application does not support current display zoom" into nyc-dev
Alan Viverette [Fri, 17 Jun 2016 13:59:12 +0000 (13:59 +0000)]
Merge "Notify user when application does not support current display zoom" into nyc-dev

8 years agoMerge "Allow stopping user to access AppWidgetService API" into nyc-dev
Tony Mak [Fri, 17 Jun 2016 13:25:05 +0000 (13:25 +0000)]
Merge "Allow stopping user to access AppWidgetService API" into nyc-dev

8 years agoDo not schedule restarts if the system is shutting down
Fyodor Kupolov [Thu, 16 Jun 2016 23:29:05 +0000 (16:29 -0700)]
Do not schedule restarts if the system is shutting down

Bug: 29357754
Change-Id: Id5cf43fb6c4c6ea04d60bd09e910a9cec194c753

8 years agoMerge "Support AVD animation falling back on UI thread" into nyc-mr1-dev
TreeHugger Robot [Fri, 17 Jun 2016 01:12:30 +0000 (01:12 +0000)]
Merge "Support AVD animation falling back on UI thread" into nyc-mr1-dev

8 years agoDo a forceLayout if pending insets is changed after relayout window
Chong Zhang [Fri, 17 Jun 2016 00:28:25 +0000 (17:28 -0700)]
Do a forceLayout if pending insets is changed after relayout window

We might have a pending MSG_RESIZED_REPORT, but if it's executed after
relayoutWindow, mPendingInsets will already be the new value and it'll
not forceLayout. So we need to forceLayout here to make sure the measure
cache is cleared.

bug: 29391054

Change-Id: I73793b1427b89e75700369ec3b37053a6a732f0d

8 years agoMerge "Correct typo in BluetoothSap binder" into nyc-mr1-dev
TreeHugger Robot [Fri, 17 Jun 2016 01:02:45 +0000 (01:02 +0000)]
Merge "Correct typo in BluetoothSap binder" into nyc-mr1-dev

8 years agoDO NOT MERGE: Don\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent...
Christopher Tate [Fri, 17 Jun 2016 00:41:07 +0000 (00:41 +0000)]
DO NOT MERGE: Don\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours am: 41821a26a5  -s ours am: b1e31ad140 am: 918fb5d453 am: 2149ebeadf  -s ours am: c61f35ed9a am: 34fb87b519 am: 1a450675f3
am: 790c87a05b  -s ours

Change-Id: I33148f02fc665d5ffa7f6a651ce2b6102456eb1b

8 years agoDO NOT MERGE: Don\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent...
Christopher Tate [Fri, 17 Jun 2016 00:34:47 +0000 (00:34 +0000)]
DO NOT MERGE: Don\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours am: 41821a26a5  -s ours am: b1e31ad140 am: 918fb5d453 am: 2149ebeadf  -s ours am: c61f35ed9a am: 34fb87b519
am: 1a450675f3

Change-Id: I5fef884dbf640b60c1bf4c28a6d95abb4d42061b

8 years agoresolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b...
Christopher Tate [Fri, 17 Jun 2016 00:32:26 +0000 (00:32 +0000)]
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e
am: d2a4e1b39c

Change-Id: I8e59a88278ba50ab7e3768031611065131ed6834

8 years agoDO NOT MERGE: Don\\\\\\\\\'t trust callers to supply app info to bindBackupAgent...
Christopher Tate [Fri, 17 Jun 2016 00:31:08 +0000 (00:31 +0000)]
DO NOT MERGE: Don\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours am: 41821a26a5  -s ours am: b1e31ad140 am: 918fb5d453 am: 2149ebeadf  -s ours am: c61f35ed9a
am: 34fb87b519

Change-Id: If7444547d0bd82f43bb05439977e536a01589b3c

8 years agoresolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab
Christopher Tate [Fri, 17 Jun 2016 00:24:29 +0000 (00:24 +0000)]
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab
am: e2c9b1af3e

Change-Id: Iab52ff84be41c1d18274d1a82492b624a7456726

8 years agoDO NOT MERGE: Don\\\\\\\\'t trust callers to supply app info to bindBackupAgent(...
Christopher Tate [Fri, 17 Jun 2016 00:22:07 +0000 (00:22 +0000)]
DO NOT MERGE: Don\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours am: 41821a26a5  -s ours am: b1e31ad140 am: 918fb5d453 am: 2149ebeadf  -s ours
am: c61f35ed9a

Change-Id: Ied60b535ef69385c369110045ea755ebe9b0b94e

8 years agoresolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
Christopher Tate [Fri, 17 Jun 2016 00:18:48 +0000 (00:18 +0000)]
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
am: d6c1126fab

Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973

8 years agoDO NOT MERGE: Don\\\\\\\'t trust callers to supply app info to bindBackupAgent()...
Christopher Tate [Fri, 17 Jun 2016 00:15:14 +0000 (00:15 +0000)]
DO NOT MERGE: Don\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours am: 41821a26a5  -s ours am: b1e31ad140 am: 918fb5d453
am: 2149ebeadf  -s ours

Change-Id: I42300992feac56eb94ab71e160da5fa8fc04929a

8 years agoresolve merge conflicts of cffb19c to mnc-dev
Christopher Tate [Fri, 17 Jun 2016 00:15:07 +0000 (00:15 +0000)]
resolve merge conflicts of cffb19c to mnc-dev
am: 3f9ea2d386

Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251

8 years agoAdd metrics for new tabs in Settings.
Fan Zhang [Fri, 6 May 2016 17:51:47 +0000 (10:51 -0700)]
Add metrics for new tabs in Settings.

Bug: 28141203
Change-Id: I37b6fce7a5c4ca1cf2dbe0795aeb58bb23ae2160

8 years agoMerge "Remove RemoteInput on lockscreen setting" into nyc-dev
Adrian Roos [Thu, 16 Jun 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev

8 years agoMerge \"docs: DP4 release notes: add Android Auto known issue\" into nyc-dev
Andrew Solovay [Thu, 16 Jun 2016 23:33:52 +0000 (23:33 +0000)]
Merge \"docs: DP4 release notes: add Android Auto known issue\" into nyc-dev
am: bc7b3b5e52

Change-Id: Id6f76fbd483dccfa05f435ab2b62cd2d06b7e393

8 years agoresolve merge conflicts of cffb19c to mnc-dev
Christopher Tate [Thu, 16 Jun 2016 23:31:39 +0000 (16:31 -0700)]
resolve merge conflicts of cffb19c to mnc-dev

Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940

8 years agoMerge "docs: DP4 release notes: add Android Auto known issue" into nyc-dev
Andrew Solovay [Thu, 16 Jun 2016 23:29:13 +0000 (23:29 +0000)]
Merge "docs: DP4 release notes: add Android Auto known issue" into nyc-dev

8 years agoDO NOT MERGE: Don\\\\\\'t trust callers to supply app info to bindBackupAgent() am...
Christopher Tate [Thu, 16 Jun 2016 22:53:29 +0000 (22:53 +0000)]
DO NOT MERGE: Don\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours am: 41821a26a5  -s ours am: b1e31ad140
am: 918fb5d453

Change-Id: I660124fada1a86288a9bfb10308cec0e1503f62e

8 years agoDO NOT MERGE: Don\\\\\'t trust callers to supply app info to bindBackupAgent() am...
Christopher Tate [Thu, 16 Jun 2016 22:50:23 +0000 (22:50 +0000)]
DO NOT MERGE: Don\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours am: 41821a26a5  -s ours
am: b1e31ad140

Change-Id: I3668160c863e8fe34ca6d233d63113069fec8e5a

8 years agoDO NOT MERGE: Don\\\\'t trust callers to supply app info to bindBackupAgent() am...
Christopher Tate [Thu, 16 Jun 2016 22:45:45 +0000 (22:45 +0000)]
DO NOT MERGE: Don\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours
am: 41821a26a5  -s ours

Change-Id: I028d0714c52079b71645197ac70a321285928fec

8 years agoDO NOT MERGE: Don\\\'t trust callers to supply app info to bindBackupAgent() am:...
Christopher Tate [Thu, 16 Jun 2016 22:39:05 +0000 (22:39 +0000)]
DO NOT MERGE: Don\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2
am: 6633a4fee4  -s ours

Change-Id: I2c10cc7ff790c84767167c76e028456ba4dcaeb3

8 years agoMerge \"Allow apps with CREATE_USERS permission to create restricted users.\" into...
Sudheer Shanka [Thu, 16 Jun 2016 22:37:38 +0000 (22:37 +0000)]
Merge \"Allow apps with CREATE_USERS permission to create restricted users.\" into nyc-dev
am: 48ee87d4a7

Change-Id: Ib61fe36aef8fc992e87ccaa692cc2712caf36570

8 years agoMerge "Allow the phone process to hide outbound text SMS" into nyc-mr1-dev
TreeHugger Robot [Thu, 16 Jun 2016 22:31:44 +0000 (22:31 +0000)]
Merge "Allow the phone process to hide outbound text SMS" into nyc-mr1-dev

8 years agoMerge "Allow apps with CREATE_USERS permission to create restricted users." into...
TreeHugger Robot [Thu, 16 Jun 2016 22:30:19 +0000 (22:30 +0000)]
Merge "Allow apps with CREATE_USERS permission to create restricted users." into nyc-dev

8 years agoDon\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am...
Christopher Tate [Thu, 16 Jun 2016 22:30:17 +0000 (22:30 +0000)]
Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7
am: ec6c3f7a32

Change-Id: Idc2b6c712078493b4186edad750d8d5beab58adf

8 years agoDO NOT MERGE: Don\\'t trust callers to supply app info to bindBackupAgent() am: d85a4...
Christopher Tate [Thu, 16 Jun 2016 22:27:18 +0000 (22:27 +0000)]
DO NOT MERGE: Don\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283
am: f615799ef2

Change-Id: Ibc84666aa491986fe861b82400affde1675e632d

8 years agoDon\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f
Christopher Tate [Thu, 16 Jun 2016 22:27:04 +0000 (22:27 +0000)]
Don\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f
am: cd777e95a7

Change-Id: I199f1354df85fcda372002887eafc1e6fb9b19d8

8 years agoDon\'t trust callers to supply app info to bindBackupAgent()
Christopher Tate [Thu, 16 Jun 2016 22:21:37 +0000 (22:21 +0000)]
Don\'t trust callers to supply app info to bindBackupAgent()
am: c58054f25f

Change-Id: I3b0bd91c38b5f13770f09f39c2eea78b63c29d7c

8 years agoDO NOT MERGE: Don\'t trust callers to supply app info to bindBackupAgent()
Christopher Tate [Thu, 16 Jun 2016 22:21:25 +0000 (22:21 +0000)]
DO NOT MERGE: Don\'t trust callers to supply app info to bindBackupAgent()
am: d85a4ed283

Change-Id: Ib1f01d4d10c82acb9f03aab4fe81d43d85d4a899

8 years agoSupport AVD animation falling back on UI thread
Doris Liu [Thu, 16 Jun 2016 02:04:36 +0000 (19:04 -0700)]
Support AVD animation falling back on UI thread

AVD will fall back to UI thread animation if the host view is
rendering onto a SW layer.

BUG: 27617346
Change-Id: I5b644529048a0c30aada3abf2f4e95e40760936d

8 years agoCall AppOpsService from the handler thread
Fyodor Kupolov [Thu, 16 Jun 2016 22:09:29 +0000 (15:09 -0700)]
Call AppOpsService from the handler thread

Otherwise it may cause deadlocks, for instance if
updateUserRestrictionsInternalLR is called with AMS lock held.

Bug: 28888422
Change-Id: I455c7392f206ff0bb6c99ec5c4a531921a115070

8 years agoMerge "Refactor DeviceDefault themes." into nyc-mr1-dev
Andrew Sapperstein [Thu, 16 Jun 2016 21:58:54 +0000 (21:58 +0000)]
Merge "Refactor DeviceDefault themes." into nyc-mr1-dev

8 years agoMerge \"Don\'t re-launch activities while the device is sleeping\" into nyc-dev
Wale Ogunwale [Thu, 16 Jun 2016 21:36:25 +0000 (21:36 +0000)]
Merge \"Don\'t re-launch activities while the device is sleeping\" into nyc-dev
am: f6e3c9a553

Change-Id: I72d39e81ae786f18fb3991fb243837e802440311

8 years agoMerge \"Bring task to front when we can\'t move to adjacent stack\" into nyc-dev
Andrii Kulian [Thu, 16 Jun 2016 21:36:22 +0000 (21:36 +0000)]
Merge \"Bring task to front when we can\'t move to adjacent stack\" into nyc-dev
am: 320c15e1b2

Change-Id: Ia0732370e4952d5cbecfb4ed86150eba090fbb49

8 years agoMerge "Don't re-launch activities while the device is sleeping" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 21:32:26 +0000 (21:32 +0000)]
Merge "Don't re-launch activities while the device is sleeping" into nyc-dev

8 years agoMerge "Bring task to front when we can't move to adjacent stack" into nyc-dev
Andrii Kulian [Thu, 16 Jun 2016 21:30:21 +0000 (21:30 +0000)]
Merge "Bring task to front when we can't move to adjacent stack" into nyc-dev

8 years agoMerge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
Yorke Lee [Thu, 16 Jun 2016 21:21:57 +0000 (21:21 +0000)]
Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
am: f33af2285b

Change-Id: If4d9abfb81929f8366fc9acc7978816d55117fbc

8 years agoMerge "Limit global drags to apps targeting SDK 24 and above" into nyc-dev
Yorke Lee [Thu, 16 Jun 2016 21:16:11 +0000 (21:16 +0000)]
Merge "Limit global drags to apps targeting SDK 24 and above" into nyc-dev

8 years agodocs: DP4 release notes: add Android Auto known issue
Andrew Solovay [Thu, 16 Jun 2016 20:37:03 +0000 (13:37 -0700)]
docs: DP4 release notes: add Android Auto known issue

See first comment for doc stage location.

Change-Id: I424195565860af0439a9bf7fefb3286e82cc98da

8 years agoMerge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
Gina Dimino [Thu, 16 Jun 2016 21:08:15 +0000 (21:08 +0000)]
Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
am: d06520a488

Change-Id: I127501113d4e290a1e8d0b3a44ba779ec36cdc1d

8 years agoCorrect typo in BluetoothSap binder
ugo_yu [Mon, 30 May 2016 12:56:28 +0000 (20:56 +0800)]
Correct typo in BluetoothSap binder

This patch fixed IBluetoothSap typo as IBluetoothMap in doBind.

Fixes: 29025598
Change-Id: Ieab3d1583839db0a33b1cfa4d2de1f27c9cb3fe4

8 years agoMerge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev
Gina Dimino [Thu, 16 Jun 2016 21:02:13 +0000 (21:02 +0000)]
Merge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev

8 years agoMerge \"docs: Minor update to DP4 release notes\" into nyc-dev
Andrew Solovay [Thu, 16 Jun 2016 20:51:48 +0000 (20:51 +0000)]
Merge \"docs: Minor update to DP4 release notes\" into nyc-dev
am: 5a3a66a253

Change-Id: I3c4b05f0fe24ddd88ce905429eaa9ed489db5f0a

8 years agoMerge "docs: Minor update to DP4 release notes" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 20:47:02 +0000 (20:47 +0000)]
Merge "docs: Minor update to DP4 release notes" into nyc-dev

8 years agoRemove RemoteInput on lockscreen setting
Adrian Roos [Thu, 16 Jun 2016 20:04:47 +0000 (13:04 -0700)]
Remove RemoteInput on lockscreen setting

Bug: 29370898
Change-Id: I8686c2266f13e7e131c2330673ec98c26037edaa

8 years agoMerge \"Report error correctly for the implementation of StreamInterface::GetData...
Yujie Qin [Thu, 16 Jun 2016 20:02:23 +0000 (20:02 +0000)]
Merge \"Report error correctly for the implementation of StreamInterface::GetData()\" into nyc-dev
am: e09415344d

Change-Id: Iedf22e08c22fed4e903794a78fc13e1ca215f19a

8 years agoMerge "Report error correctly for the implementation of StreamInterface::GetData...
Yujie Qin [Thu, 16 Jun 2016 19:48:18 +0000 (19:48 +0000)]
Merge "Report error correctly for the implementation of StreamInterface::GetData()" into nyc-dev

8 years agoDon't re-launch activities while the device is sleeping
Wale Ogunwale [Thu, 16 Jun 2016 17:03:40 +0000 (10:03 -0700)]
Don't re-launch activities while the device is sleeping

- Don't ensure configuration for top running activity that is in the
stopped state if the configuration change while the device is sleeping
as we don't want to relaunch activities in this state.
- Don't make activities visible while the device is sleeping and the
activity isn't in voice interaction mode. Making it visible can also
lead to the activity been relaunched due to configuration changing.

Note the the right configuration will be applied to the activity the next
time we try to make it visible. The re-launch will happen then.

Bug: 28518380
Change-Id: Ic22193db645dec358065cb05e7f1afc6fc8ac49f

8 years agoMerge \"Fix unresponsive brightness slider after font size change\" into nyc-dev
Adrian Roos [Thu, 16 Jun 2016 19:29:32 +0000 (19:29 +0000)]
Merge \"Fix unresponsive brightness slider after font size change\" into nyc-dev
am: db81dd9d2e

Change-Id: Ib507eb86306687928dc775945e033b2bcfb17ad3

8 years agoMerge "Fix unresponsive brightness slider after font size change" into nyc-dev
Adrian Roos [Thu, 16 Jun 2016 19:25:47 +0000 (19:25 +0000)]
Merge "Fix unresponsive brightness slider after font size change" into nyc-dev

8 years agoMerge \"Include cause when reporting errors.\" into nyc-dev
Steve McKay [Thu, 16 Jun 2016 19:18:45 +0000 (19:18 +0000)]
Merge \"Include cause when reporting errors.\" into nyc-dev
am: 60585e6c54

Change-Id: I014009e3c8e8b167b3d322886cadc20f2d9f6eaf

8 years agoMerge "Include cause when reporting errors." into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 19:14:04 +0000 (19:14 +0000)]
Merge "Include cause when reporting errors." into nyc-dev

8 years agoMerge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev
Felipe Leme [Thu, 16 Jun 2016 18:52:50 +0000 (18:52 +0000)]
Merge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev
am: 47c3afa10b

Change-Id: I60c54353bdbd57818bcf5bcc47d55328d46ce6b9

8 years agoMerge "Check extra type before blindingly casting to Parcelable." into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 18:47:50 +0000 (18:47 +0000)]
Merge "Check extra type before blindingly casting to Parcelable." into nyc-dev

8 years agoMerge "Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc...
Android Build Merger (Role) [Thu, 16 Jun 2016 18:44:17 +0000 (18:44 +0000)]
Merge "Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev am: 47cfac6803" into nyc-mr1-dev

8 years agoMerge "Add better configurability for dialog theme colours." into nyc-mr1-dev
Michael Kwan [Thu, 16 Jun 2016 18:44:13 +0000 (18:44 +0000)]
Merge "Add better configurability for dialog theme colours." into nyc-mr1-dev

8 years agoMerge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev
Dianne Hackborn [Thu, 16 Jun 2016 18:43:57 +0000 (18:43 +0000)]
Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev
am: 47cfac6803

Change-Id: I94a6674bcb0327bc55fbfc1d18c4a5d6d723a52e

8 years agoMerge "Fix issue #29371078: Foreground jobs should not count..." into nyc-dev
Dianne Hackborn [Thu, 16 Jun 2016 18:39:02 +0000 (18:39 +0000)]
Merge "Fix issue #29371078: Foreground jobs should not count..." into nyc-dev

8 years agoBring task to front when we can't move to adjacent stack
Andrii Kulian [Wed, 15 Jun 2016 22:27:01 +0000 (15:27 -0700)]
Bring task to front when we can't move to adjacent stack

If task was requested to move to adjacent stack with mLaunchStackId set
and FLAG_ACTIVITY_LAUNCH_ADJACENT not set - we don't move it from its
current stack. If the task was covered with other task(s) it wouldn't
be brought to front.
This CL checks if mLaunchStackId is provided and is a valid stack for this
task, then we move it to front of current stack as a safer option.

Bug: 29103549
Change-Id: I3065960f082cfbf9a5b43c6e83b5cebe3dd69df6

8 years agodocs: Minor update to DP4 release notes
Andrew Solovay [Thu, 16 Jun 2016 00:32:42 +0000 (17:32 -0700)]
docs: Minor update to DP4 release notes

Added a new section from Dirk, with a couple of gotchas for people
updating from API level ≤22 to 24.

See first comment for doc stage location.

Change-Id: I237e9efac75b9c1e0fbeecf362dbc0de7c958c60

8 years agoMerge \"Support using uninstalled WebView packages as WebView implementation.\" into...
Gustav Sennton [Thu, 16 Jun 2016 17:46:53 +0000 (17:46 +0000)]
Merge \"Support using uninstalled WebView packages as WebView implementation.\" into nyc-dev
am: e25c8532b6

Change-Id: Ie9f405765c146d21f1399037dd236d440902f0f9

8 years agoInclude cause when reporting errors.
Steve McKay [Tue, 14 Jun 2016 22:56:50 +0000 (15:56 -0700)]
Include cause when reporting errors.

Bug: 29191892
Change-Id: I5f904da3a8564ec68ca634c28e3eda7f496a5c1c

8 years agoMerge "Support using uninstalled WebView packages as WebView implementation." into...
Gustav Sennton [Thu, 16 Jun 2016 17:40:08 +0000 (17:40 +0000)]
Merge "Support using uninstalled WebView packages as WebView implementation." into nyc-dev

8 years agoRefactor DeviceDefault themes.
Andrew Sapperstein [Sat, 11 Jun 2016 19:20:50 +0000 (12:20 -0700)]
Refactor DeviceDefault themes.

Adds colors_device_defaults.xml and defines the primary, primary dark, accent,
and secondary colors for the dark, light, and settings themes.

Also creates primary and primary dark values for the Material.Settings theme
and updates the themes to use those values.

Finally, fixes HelpUtils to properly get the value of colorAccent. Previously,
if colorAccent were defined to a hex value directly, it would crash.

BUG: 28625050
BUG: 29003416

Change-Id: Ia73b7368014c57c1676904d494cbb5169c8a836b

8 years agoCheck extra type before blindingly casting to Parcelable.
Felipe Leme [Thu, 16 Jun 2016 17:02:38 +0000 (10:02 -0700)]
Check extra type before blindingly casting to Parcelable.

BUG: 29402928
Change-Id: If1729b8a4fcde724372b0a23cfae723a5d9b4faa

8 years agoMerge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev
Makoto Onuki [Thu, 16 Jun 2016 17:05:54 +0000 (17:05 +0000)]
Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev

8 years agoMerge "Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem" into...
Mahaver Chopra [Thu, 16 Jun 2016 16:49:10 +0000 (16:49 +0000)]
Merge "Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem" into nyc-mr1-dev

8 years agoNotify user when application does not support current display zoom
Alan Viverette [Thu, 16 Jun 2016 16:47:58 +0000 (12:47 -0400)]
Notify user when application does not support current display zoom

Bug: 29322470
Change-Id: Id33215f6b0b20b332c3c9101aedf9de0261ee5ea

8 years agoLimit global drags to apps targeting SDK 24 and above
Yorke Lee [Wed, 15 Jun 2016 17:03:18 +0000 (10:03 -0700)]
Limit global drags to apps targeting SDK 24 and above

Bug: 29127791

Change-Id: Ib5f85a207bdb79eeac0418fda78e452d225761bc