OSDN Git Service
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
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
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
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
TreeHugger Robot [Fri, 17 Jun 2016 01:02:45 +0000 (01:02 +0000)]
Merge "Correct typo in BluetoothSap binder" into nyc-mr1-dev
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
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
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
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
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
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
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
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
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
Adrian Roos [Thu, 16 Jun 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Remove RemoteInput on lockscreen setting" 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
Christopher Tate [Thu, 16 Jun 2016 23:31:39 +0000 (16:31 -0700)]
resolve merge conflicts of
cffb19c to mnc-dev
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Andrew Sapperstein [Thu, 16 Jun 2016 21:58:54 +0000 (21:58 +0000)]
Merge "Refactor DeviceDefault themes." into nyc-mr1-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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 16 Jun 2016 20:47:02 +0000 (20:47 +0000)]
Merge "docs: Minor update to DP4 release notes" into nyc-dev
Adrian Roos [Thu, 16 Jun 2016 20:04:47 +0000 (13:04 -0700)]
Remove RemoteInput on lockscreen setting
Bug:
29370898
Change-Id: I8686c2266f13e7e131c2330673ec98c26037edaa
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
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
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
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
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
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
TreeHugger Robot [Thu, 16 Jun 2016 19:14:04 +0000 (19:14 +0000)]
Merge "Include cause when reporting errors." 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
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
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
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
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
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
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
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
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
Steve McKay [Tue, 14 Jun 2016 22:56:50 +0000 (15:56 -0700)]
Include cause when reporting errors.
Bug:
29191892
Change-Id: I5f904da3a8564ec68ca634c28e3eda7f496a5c1c
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
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
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
Makoto Onuki [Thu, 16 Jun 2016 17:05:54 +0000 (17:05 +0000)]
Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev
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
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
Todd Kennedy [Thu, 16 Jun 2016 16:34:34 +0000 (16:34 +0000)]
Merge \"Make sure we\'re locked\" into nyc-dev
am:
32d67fab83
Change-Id: I2f80a7af0ddd6f282cde6c8d9ea79e0c614fba6b
Todd Kennedy [Thu, 16 Jun 2016 16:22:53 +0000 (16:22 +0000)]
Merge "Make sure we're locked" into nyc-dev
Sudheer Shanka [Thu, 16 Jun 2016 16:11:08 +0000 (09:11 -0700)]
Allow apps with CREATE_USERS permission to create restricted users.
Bug:
29189712
Change-Id: I0f2677adddb22c11cb5a3e38763b0967d9cbd541
Victor Chang [Thu, 16 Jun 2016 15:21:07 +0000 (15:21 +0000)]
Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am:
6437205648
Change-Id: If23d7b5ab2c79874714a9f6a67625b09e7f83699
Victor Chang [Thu, 16 Jun 2016 15:13:32 +0000 (15:13 +0000)]
Merge "Fix that work apps settings page crash after changing work profile to use separated lock" into nyc-dev
Gustav Sennton [Tue, 14 Jun 2016 14:32:19 +0000 (15:32 +0100)]
Support using uninstalled WebView packages as WebView implementation.
A package can be uninstalled for the system user but still be installed
on the device. Currently, we do not use such a package as WebView
implementation which means we fall back to using the fallback WebView
package.
However, if the fallback package is not valid (because it needs to be
updated first) loading WebView will fail.
With this change we fetch allow the fetching of information from
packages that are uninstalled for the system user so that we can still
load WebView when the only valid WebView provider is uninstalled for the
system user.
Also listen to package additions/changes/removals for all users -
otherwise we won't notice when a package becomes replaced if it was
already uninstalled for the system user.
Bug:
29321185
Change-Id: Ia23c4493844877aea1b4eab7e666fd37540c4f97
Todd Kennedy [Wed, 15 Jun 2016 16:54:28 +0000 (09:54 -0700)]
Make sure we're locked
Before calling a method ending with LPw, we need to have the mPackages lock.
Make sure we do that.
Also, ditch the iterator for traversing an ArraySet.
Bug:
29356333
Change-Id: I67df971f2961b577f31153cef46fb153458d6965
Mahaver Chopra [Thu, 16 Jun 2016 13:05:58 +0000 (14:05 +0100)]
Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem
Bug:
29409746
Change-Id: I5254456cc2364c93809cebbe2d134a873873790d
Ricky Wai [Thu, 16 Jun 2016 10:39:03 +0000 (10:39 +0000)]
Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
am:
43f6a45e7e
Change-Id: If6535443baacec9fc1af2ed376c3ffa25f677103
Ricky Wai [Thu, 16 Jun 2016 10:33:22 +0000 (10:33 +0000)]
Merge "Add permission checking on service calls in LockSettingsService" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 10:26:32 +0000 (10:26 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
d58da1be76 -s ours
Change-Id: I8f6a3c344ce19bf7dbdf3882e393627ed8029d46
TreeHugger Robot [Thu, 16 Jun 2016 10:21:18 +0000 (10:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Robin Lee [Thu, 16 Jun 2016 10:10:23 +0000 (10:10 +0000)]
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am:
3e343ffd91
Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1
Robin Lee [Thu, 16 Jun 2016 10:06:10 +0000 (10:06 +0000)]
Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev
Android Build Merger (Role) [Thu, 16 Jun 2016 10:03:53 +0000 (10:03 +0000)]
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-dev am:
65266b99d2 -s ours" into nyc-mr1-dev
TreeHugger Robot [Thu, 16 Jun 2016 10:03:44 +0000 (10:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 16 Jun 2016 10:03:28 +0000 (10:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
65266b99d2 -s ours
Change-Id: I633386b991908081feeaaf100554c7c455980c13
TreeHugger Robot [Thu, 16 Jun 2016 09:58:55 +0000 (09:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 09:57:54 +0000 (09:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Yujie Qin [Thu, 16 Jun 2016 09:39:34 +0000 (11:39 +0200)]
Report error correctly for the implementation of
StreamInterface::GetData()
Bug:
28889197
Change-Id: Id07755e1b3637f85b6176a59935ad3a5597cfb05
Bill Yi [Thu, 16 Jun 2016 08:48:06 +0000 (01:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9447404228057a1b952d1ac04f1b1df4d73568b9
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Jun 2016 08:42:16 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8186498fb657aa424eeb74f965fa44f7a053f65c
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Jun 2016 05:10:07 +0000 (22:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d0d4f9c0cc63d726daf44da8cb5f1b11dca276f
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Jun 2016 04:49:11 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e3e3acf4c81fea5831768ccb73a313d16bab865
Auto-generated-cl: translation import
Selim Cinek [Thu, 16 Jun 2016 04:25:26 +0000 (04:25 +0000)]
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am:
c1720dce1b
Change-Id: I14674254eb79fef58e4dcb1a8d7ecaab24831691
TreeHugger Robot [Thu, 16 Jun 2016 04:19:47 +0000 (04:19 +0000)]
Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev
Ruben Brunk [Thu, 16 Jun 2016 01:37:29 +0000 (01:37 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices.
am:
d430f1a0be
Change-Id: I9501d2926246f5f83ef24a5105323d8e43807608
Ruben Brunk [Thu, 16 Jun 2016 00:55:41 +0000 (17:55 -0700)]
Remove coarse location pre-grant for preinstalled VrListenerServices.
Bug:
28919229
Change-Id: I97393308129c65ef2822014775d3e77e25dc21e6
Ruben Brunk [Thu, 16 Jun 2016 00:34:32 +0000 (00:34 +0000)]
Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev
am:
931a7c03e0
Change-Id: I70301a77d89271e74e69efb92f340f1dbf6b3ca8
Mihai Nita [Thu, 16 Jun 2016 00:34:30 +0000 (00:34 +0000)]
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am:
c8c9afeacb
Change-Id: Iaa4df1af4a18ad0bc4e99a5bd47aa8f6c1357e50
Dianne Hackborn [Thu, 16 Jun 2016 00:30:24 +0000 (17:30 -0700)]
Fix issue #
29371078: Foreground jobs should not count...
...as active for idle maintenance
Nor jobs of whitelisted apps.
Now they don't.
Also remove the no longer used "active download" tracking code.
Change-Id: I553197801f6eabaf15716f3201dd65257a0d4e94
Ruben Brunk [Thu, 16 Jun 2016 00:29:31 +0000 (00:29 +0000)]
Merge "Fix VR transition for display on/off sequence." into nyc-dev