OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Add pm operation to set user restrictions.\" into nyc-dev
Sudheer Shanka [Fri, 17 Jun 2016 22:08:07 +0000 (22:08 +0000)]
Merge \"Add pm operation to set user restrictions.\" into nyc-dev
am: f6824b51cc

Change-Id: I137151742049c0a02d41a02e49abb679234f14b9

8 years agoMerge "Add pm operation to set user restrictions." into nyc-dev
TreeHugger Robot [Fri, 17 Jun 2016 22:03:58 +0000 (22:03 +0000)]
Merge "Add pm operation to set user restrictions." into nyc-dev

8 years agoMerge \"Clean up ex-users in lock settings db\" into nyc-dev
Amith Yamasani [Fri, 17 Jun 2016 22:01:35 +0000 (22:01 +0000)]
Merge \"Clean up ex-users in lock settings db\" into nyc-dev
am: 8cbe1a6309

Change-Id: I97a70eafc6e6657b8d0f87a134c17499d66ccc77

8 years agoMerge \"Don\'t dispatch Uris with appended user handle\" into nyc-dev
Svet Ganov [Fri, 17 Jun 2016 22:01:32 +0000 (22:01 +0000)]
Merge \"Don\'t dispatch Uris with appended user handle\" into nyc-dev
am: 7ef9f61be6

Change-Id: I1ecce2c6c319fa22a09472f110823798e3ffee9f

8 years agoMerge "Clean up ex-users in lock settings db" into nyc-dev
Amith Yamasani [Fri, 17 Jun 2016 21:55:59 +0000 (21:55 +0000)]
Merge "Clean up ex-users in lock settings db" into nyc-dev

8 years agoMerge "Don't dispatch Uris with appended user handle" into nyc-dev
Svetoslav Ganov [Fri, 17 Jun 2016 21:51:33 +0000 (21:51 +0000)]
Merge "Don't dispatch Uris with appended user handle" into nyc-dev

8 years agoMerge \"Ensure that the tint is properly applied in docked mode.\" into nyc-dev
Winson [Fri, 17 Jun 2016 21:34:21 +0000 (21:34 +0000)]
Merge \"Ensure that the tint is properly applied in docked mode.\" into nyc-dev
am: b1f3404f8f

Change-Id: I60d795b21f9a5a2b0f2555e959607a8dfefa7e9f

8 years agoMerge "Ensure that the tint is properly applied in docked mode." into nyc-dev
Winson Chung [Fri, 17 Jun 2016 21:29:02 +0000 (21:29 +0000)]
Merge "Ensure that the tint is properly applied in docked mode." into nyc-dev

8 years agoMerge \"Work on issue #29328569: NPE in \" com.google.android.configupdater\"\" into...
Dianne Hackborn [Fri, 17 Jun 2016 20:39:32 +0000 (20:39 +0000)]
Merge \"Work on issue #29328569: NPE in \" com.google.android.configupdater\"\" into nyc-dev
am: 6bc33b07f4

Change-Id: Idff85b167a76c6a1bda3fe7e1b5fd2a5cfc6eccc

8 years agoMerge "Work on issue #29328569: NPE in " com.google.android.configupdater"" into...
Dianne Hackborn [Fri, 17 Jun 2016 20:33:21 +0000 (20:33 +0000)]
Merge "Work on issue #29328569: NPE in " com.google.android.configupdater"" into nyc-dev

8 years agoMerge \"QS Edit: Fix auto-selecting add location\" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 20:28:14 +0000 (20:28 +0000)]
Merge \"QS Edit: Fix auto-selecting add location\" into nyc-dev
am: dd65ee628f

Change-Id: I33256558f03d993c88520ff50d4bab915ee7ccbd

8 years agoMerge "QS Edit: Fix auto-selecting add location" into nyc-dev
TreeHugger Robot [Fri, 17 Jun 2016 20:22:45 +0000 (20:22 +0000)]
Merge "QS Edit: Fix auto-selecting add location" into nyc-dev

8 years agoMerge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 18:45:04 +0000 (18:45 +0000)]
Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
am: fc70b07385

Change-Id: I2aed24cf36354fbe332787082bcf628357bab3b1

8 years agoMerge \"Merge \\\"Docs: Completed updates to the Data Binding docs\\\" into mnc-io...
Hemal Patel [Fri, 17 Jun 2016 18:40:46 +0000 (18:40 +0000)]
Merge \"Merge \\\"Docs: Completed updates to the Data Binding docs\\\" into mnc-io-docs am: eebe22fef6 am: f693ea687f\" into nyc-dev
am: 68bfdd71b5

Change-Id: Ic5b6de49c28329330477b7881c64eb0614628f4d

8 years agoMerge \"docs: NDK r12 release notes and downloads\" into nyc-dev
Joe Fernandez [Fri, 17 Jun 2016 18:40:37 +0000 (18:40 +0000)]
Merge \"docs: NDK r12 release notes and downloads\" into nyc-dev
am: 9f0722a4c7

Change-Id: If4d04180cb625f319887ea156cdfec25245d6031

8 years agoMerge "QS API: Fix mService and mTile being null once and for all" into nyc-dev
TreeHugger Robot [Fri, 17 Jun 2016 18:38:25 +0000 (18:38 +0000)]
Merge "QS API: Fix mService and mTile being null once and for all" into nyc-dev

8 years agoMerge "Merge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs...
Android Build Merger (Role) [Fri, 17 Jun 2016 18:35:50 +0000 (18:35 +0000)]
Merge "Merge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs am: eebe22fef6 am: f693ea687f" into nyc-dev

8 years agoMerge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs am...
Hemal Patel [Fri, 17 Jun 2016 18:35:24 +0000 (18:35 +0000)]
Merge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs am: eebe22fef6
am: f693ea687f

Change-Id: I235e73606098e54fc14568c6437af314f9bea337

8 years agoMerge "docs: NDK r12 release notes and downloads" into nyc-dev
Joe Fernandez [Fri, 17 Jun 2016 18:35:07 +0000 (18:35 +0000)]
Merge "docs: NDK r12 release notes and downloads" into nyc-dev

8 years agoMerge \"Docs: Completed updates to the Data Binding docs\" into mnc-io-docs
Yigit Boyar [Fri, 17 Jun 2016 18:31:17 +0000 (18:31 +0000)]
Merge \"Docs: Completed updates to the Data Binding docs\" into mnc-io-docs
am: eebe22fef6

Change-Id: I47b4003b1bd1bb5cdfc12bde543dd2c9d8babdcc

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

Change-Id: Ia95dd424c118b962a9a10ac074d508758b49ea90

8 years agoMerge "Docs: Completed updates to the Data Binding docs" into mnc-io-docs
Hemal Patel [Fri, 17 Jun 2016 18:25:47 +0000 (18:25 +0000)]
Merge "Docs: Completed updates to the Data Binding docs" into mnc-io-docs

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 agodocs: NDK r12 release notes and downloads
Joe Fernandez [Thu, 16 Jun 2016 20:31:28 +0000 (13:31 -0700)]
docs: NDK r12 release notes and downloads

b/29188616

Change-Id: Ida2b9b0e308799f9001127006e3be84318857aaa

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

Change-Id: I50aab94c497af12a3f2d3522425ddd850c2e3793

8 years agoMerge \"Bring out your toggles\" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 17:26:50 +0000 (17:26 +0000)]
Merge \"Bring out your toggles\" into nyc-dev
am: 3aee783837

Change-Id: I50ac9d6382b10335464fb3608afbf0aeb9c1dc7b

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 agoQS Edit: Fix auto-selecting add location
Jason Monk [Fri, 17 Jun 2016 17:15:34 +0000 (13:15 -0400)]
QS Edit: Fix auto-selecting add location

We depend on a layout listener for when we ask for focus, but layout
sometimes doesn't happen.  Make it always happen.

Change-Id: I7c805470c6ce9863bf7eac627f59d49191ce8946
Fixes: 29126464

8 years agoQS API: Fix mService and mTile being null once and for all
Jason Monk [Fri, 17 Jun 2016 16:42:59 +0000 (12:42 -0400)]
QS API: Fix mService and mTile being null once and for all

Change-Id: Idd82e4c2f6cfc2b30432e15e23963c1d7a959e43
Fixes: 29121793

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

Change-Id: Ifca7385204731e6b764fbeda59570f1789ecc0e0

8 years agoMerge \"Call AppOpsService from the handler thread\" into nyc-dev
Fyodor Kupolov [Fri, 17 Jun 2016 16:03:54 +0000 (16:03 +0000)]
Merge \"Call AppOpsService from the handler thread\" into nyc-dev
am: 1347cdb2e1

Change-Id: If17588d0b12412c88e21d8a2ee3ee9bfc4778589

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...
Alan Viverette [Fri, 17 Jun 2016 14:05:14 +0000 (14:05 +0000)]
Merge \"Notify user when application does not support current display zoom\" into nyc-dev
am: c577a50d09

Change-Id: Ibab788d39a4b93ef57aaffd81debd0447ffa8f9a

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:31:43 +0000 (13:31 +0000)]
Merge \"Allow stopping user to access AppWidgetService API\" into nyc-dev
am: ab8d4cf645

Change-Id: If1ed361c6f8c7008271cf1da4317c9ac47a5af73

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 agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 05:16:42 +0000 (05:16 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 12af7eb3ab  -s ours

Change-Id: I25c71a14da3d1fa62d7916f2cc54fb987d87d2f6

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 05:09:37 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 05:03:23 +0000 (05:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 3aca33df86  -s ours

Change-Id: I021c66cdef761d5eac267b21f5e3c28ec9e8a883

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:56:29 +0000 (04:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 90730d5542  -s ours

Change-Id: I5d6d7f5e5c620226242060dfbb14f0464aacc98f

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:56:27 +0000 (04:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: d063b809ec  -s ours

Change-Id: I72d0c6acc64adc5852e95f804ef7b7f4730b6e8f

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:53:13 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:50:56 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:50:40 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:47:08 +0000 (04:47 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 036c415394  -s ours

Change-Id: I5e2c9b89ed067793303ab901de2ac95401ea37a3

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:42:18 +0000 (04:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:28:28 +0000 (04:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 11b2b26911  -s ours

Change-Id: If8ae0b33ababcad202f1413032772182acb73de3

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:28:26 +0000 (04:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 0555bb3003  -s ours

Change-Id: I07fc3a494ca2ab9e5585febd187c08073483c297

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:23:13 +0000 (04:23 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: c52cdca3a6  -s ours

Change-Id: I28de93fe3f11438c86a95d8ec265f5f690e6f617

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:23:11 +0000 (04:23 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: f81b519438  -s ours

Change-Id: I92d23239291c708c36e0096719ed0420fa360ef2

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:22:50 +0000 (04:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:22:08 +0000 (04:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:18:05 +0000 (04:18 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: c4a5178d66  -s ours

Change-Id: I2399e19b8b0e9080531f47ca66d552e909b6533b

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:18:04 +0000 (04:18 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: b141b6399f  -s ours

Change-Id: Ic9c2413d05260cdebcf38d729e129a5fa19a0bff

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:16:11 +0000 (04:16 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:15:51 +0000 (04:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:13:19 +0000 (04:13 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:12:45 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:45:54 +0000 (19:45 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I450ba7622c907e80c033482bfc172191f3b37f0a

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:24:25 +0000 (19:24 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I695f05865fc2e7ae823f4ffe1798b3aa31d72e43

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:21:52 +0000 (19:21 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Iae320ca99c6b3f680aac48a15c116ba64943402b

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:19:18 +0000 (19:19 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I54cae0a8ea108c66939d3ee1323e32ced1e75a23

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:12:59 +0000 (19:12 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: If1a0f4a9b8a7329642534da75e53f5880b4499a6

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:08:15 +0000 (19:08 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Idc9770710ba28c470425d671a454a040d50d0ff4

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:05:49 +0000 (19:05 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ib1d2355bb12e8090464730a3f8879b8aaf216d5a

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:01:14 +0000 (19:01 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I7e5fb3ca809a9b3957f562a6020ffc0de18a0a64

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 01:58:50 +0000 (18:58 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I306c97d17e5448007f5ba1bfa0871d585436c061

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 01:56:24 +0000 (18:56 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I6cbdf2d9ffe8670574717af9e7e676fd6d2843fc

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 agoDO NOT MERGE: Don\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent...
Christopher Tate [Fri, 17 Jun 2016 01:41:37 +0000 (01: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
am: 02435d2419

Change-Id: I0c43624a99c487c8d004f2de5da6f08f2654bbde

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 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 agoresolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b...
Christopher Tate [Fri, 17 Jun 2016 00:38:13 +0000 (00:38 +0000)]
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
am: 1c3be1a5b1

Change-Id: If28cb6bef6bb51540e03aede5ade118ad61805dd

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 agoWork on issue #29328569: NPE in " com.google.android.configupdater"
Dianne Hackborn [Fri, 17 Jun 2016 00:05:47 +0000 (17:05 -0700)]
Work on issue #29328569: NPE in " com.google.android.configupdater"

Make the activity manager look at the "killed" state of a process
before deciding it is in a state where a new client can attach to
a content provider.  Hopefully this will get rid of some races
around attaching to providers and processes being killed.

Also add a little more information when killing a client of a
provider describing the oom adj of that provider's process.

Change-Id: I4efe5daf0a96e4663d5df88827ef401b1311de3f

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

Change-Id: I015d3019792ecb3e4d788ace36f1ae2c9e4fb4f8

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

Change-Id: I5a69215f86a7112d2208a60d3e72279e82d20dd1

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 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:38:52 +0000 (22:38 +0000)]
Merge \"Allow apps with CREATE_USERS permission to create restricted users.\" into nyc-dev
am: 48ee87d4a7

Change-Id: I3f66f1d5937ed29f62d687d1c0c6dcfa7d88637d

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