OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Fix navigation bar order in seascape" into nyc-mr1-dev
Adrian Roos [Wed, 13 Jul 2016 14:31:31 +0000 (14:31 +0000)]
Merge "Fix navigation bar order in seascape" into nyc-mr1-dev

8 years agoMerge "Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED." into...
Mahaver Chopra [Wed, 13 Jul 2016 12:27:00 +0000 (12:27 +0000)]
Merge "Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED." into nyc-mr1-dev

8 years agoMerge "Adds a screenshot wallpaper method to WallpaperManagerService." into nyc-mr1-dev
Zak Cohen [Wed, 13 Jul 2016 10:15:01 +0000 (10:15 +0000)]
Merge "Adds a screenshot wallpaper method to WallpaperManagerService." into nyc-mr1-dev

8 years agoAdd IPv6 tethering coordinator
Erik Kline [Fri, 8 Jul 2016 08:21:26 +0000 (17:21 +0900)]
Add IPv6 tethering coordinator

Add an IPv6TetheringCoordinator to TetheringMaster StateMachine, which
receives and processes NetworkState updates and passes the necessary IPv6
information to the revelant TetherInterfaceStateMachine.

Add an IPv6TetheringInterfaceServices to TetherInterfaceStateMachine, which
is responsible for adding local network routes and managing an IPv6
RouterAdvertisementDaemon.

Bug: 9580643
Change-Id: I3eaae460b80752e2115359d7bde873a1e9ea515a

8 years agoMerge "Don't make redundant launch while updating configuration" into nyc-mr1-dev
Andrii Kulian [Wed, 13 Jul 2016 02:20:11 +0000 (02:20 +0000)]
Merge "Don't make redundant launch while updating configuration" into nyc-mr1-dev

8 years agoMerge "Fix a few log messages that didn't have a space in the SoundTriggerTestApp...
TreeHugger Robot [Wed, 13 Jul 2016 01:54:06 +0000 (01:54 +0000)]
Merge "Fix a few log messages that didn't have a space in the SoundTriggerTestApp" into nyc-mr1-dev

8 years agoMerge "MediaDataSource: add DrmInitialization for IDataSource." into nyc-mr1-dev
Wei Jia [Wed, 13 Jul 2016 01:48:07 +0000 (01:48 +0000)]
Merge "MediaDataSource: add DrmInitialization for IDataSource." into nyc-mr1-dev

8 years agoMerge "Allow LockPatternUtils usage on non-looper threads" into nyc-mr1-dev
Adrian Roos [Wed, 13 Jul 2016 01:41:15 +0000 (01:41 +0000)]
Merge "Allow LockPatternUtils usage on non-looper threads" into nyc-mr1-dev

8 years agoMerge "When display is frozen prefer preserving orientation." into nyc-mr1-dev
Rob Carr [Wed, 13 Jul 2016 01:37:46 +0000 (01:37 +0000)]
Merge "When display is frozen prefer preserving orientation." into nyc-mr1-dev

8 years agoMerge "Trapping backspace at EditText level to prevent popping Docs." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 01:26:50 +0000 (01:26 +0000)]
Merge "Trapping backspace at EditText level to prevent popping Docs." into nyc-mr1-dev

8 years agoMerge "MediaSessionService: Support managed profile" into nyc-mr1-dev
Jaewan Kim [Wed, 13 Jul 2016 00:46:06 +0000 (00:46 +0000)]
Merge "MediaSessionService: Support managed profile" into nyc-mr1-dev

8 years agoMerge \"docs: fix redirects for shareables\" into nyc-dev
Joe Fernandez [Wed, 13 Jul 2016 00:45:10 +0000 (00:45 +0000)]
Merge \"docs: fix redirects for shareables\" into nyc-dev
am: e181729b18

Change-Id: I5aff432f11ac7af3d653a367a79c42cbb01547b6

8 years agoMerge "Don't show times before 2000-01-01" into nyc-mr1-dev
Damien Bargiacchi [Wed, 13 Jul 2016 00:40:06 +0000 (00:40 +0000)]
Merge "Don't show times before 2000-01-01" into nyc-mr1-dev

8 years agoMerge "docs: fix redirects for shareables" into nyc-dev
Joe Fernandez [Wed, 13 Jul 2016 00:37:11 +0000 (00:37 +0000)]
Merge "docs: fix redirects for shareables" into nyc-dev

8 years agoMerge "Fix issue where GnssMeasurements wouldn't allow empty measurements." into...
David Christie [Wed, 13 Jul 2016 00:21:19 +0000 (00:21 +0000)]
Merge "Fix issue where GnssMeasurements wouldn't allow empty measurements." into nyc-mr1-dev

8 years agoFix a few log messages that didn't have a space in the SoundTriggerTestApp
Chris Thornton [Tue, 12 Jul 2016 22:05:18 +0000 (15:05 -0700)]
Fix a few log messages that didn't have a space in the SoundTriggerTestApp

Change-Id: If3b5ac6533429843d4be733bd31f2bb83e1d5971

8 years agoMerge "Wakelock timeout for AnyMotionDetector. Bug: 29959125" into nyc-mr1-dev
Kevin Gabayan [Wed, 13 Jul 2016 00:14:21 +0000 (00:14 +0000)]
Merge "Wakelock timeout for AnyMotionDetector. Bug: 29959125" into nyc-mr1-dev

8 years agodocs: fix redirects for shareables
Joe Fernandez [Wed, 13 Jul 2016 00:13:55 +0000 (17:13 -0700)]
docs: fix redirects for shareables

b/30037099

Change-Id: I201b428d156a7f3eb49d92c6f5539b8f2c1998bb

8 years agoMediaDataSource: add DrmInitialization for IDataSource.
Wei Jia [Thu, 7 Jul 2016 23:08:30 +0000 (16:08 -0700)]
MediaDataSource: add DrmInitialization for IDataSource.

Bug: 29342399
Bug: 28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2

8 years agoDon't make redundant launch while updating configuration
Andrii Kulian [Wed, 13 Jul 2016 00:11:35 +0000 (17:11 -0700)]
Don't make redundant launch while updating configuration

If the configuration changed the same time when the app was launched,
from ActivityStackSupervisor#realStartActivityLocked we updated
configuration, which lead to resuming top activity in focused stack.
This caused second redundant launch of already launching activity.

Bug: 29516875
Change-Id: I2babe1936dfb53b5a440deee34874731913db2eb

8 years agoFix docs for View.DRAG_FLAG_GLOBAL
Vladislav Kaznacheev [Wed, 13 Jul 2016 00:08:50 +0000 (00:08 +0000)]
Fix docs for View.DRAG_FLAG_GLOBAL
am: 9a44eaec53

Change-Id: I82786f107815361b73655b92dc4e54ee255296d9

8 years agoWakelock timeout for AnyMotionDetector.
Kevin Gabayan [Fri, 8 Jul 2016 17:41:24 +0000 (10:41 -0700)]
Wakelock timeout for AnyMotionDetector.
Bug: 29959125

Change-Id: I7260fd1640b87884bb550ff428eb9cd1dc111512

8 years agoTrapping backspace at EditText level to prevent popping Docs.
Ben Lin [Mon, 11 Jul 2016 23:25:33 +0000 (16:25 -0700)]
Trapping backspace at EditText level to prevent popping Docs.

When the EditText is empty, pressing backspace on soft/hardware keyboard
will call on the EditText's OnKeyListener. Since we don't handle
backspace, it will then bubble up to Activity-level, which will then pop
the document stack due to the feature of using backspace as navigation.
This will trap the call correctly if the EditText is empty.

Bug: 30066261
Change-Id: I231507b9469bfa52478872491f1d2713a1ac58ba

8 years agoMerge "Fix issue #30013670: Phone AP crash when testing VT call" into nyc-mr1-dev
Dianne Hackborn [Tue, 12 Jul 2016 23:28:37 +0000 (23:28 +0000)]
Merge "Fix issue #30013670: Phone AP crash when testing VT call" into nyc-mr1-dev

8 years agoMerge "SoundTriggerDetector should look at the return code to honour success" into...
Chris Thornton [Tue, 12 Jul 2016 23:24:40 +0000 (23:24 +0000)]
Merge "SoundTriggerDetector should look at the return code to honour success" into nyc-mr1-dev

8 years agoMerge "Move grantDefaultPermissions back to onNewUserCreated" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 23:22:43 +0000 (23:22 +0000)]
Merge "Move grantDefaultPermissions back to onNewUserCreated" into nyc-mr1-dev

8 years agoFix navigation bar order in seascape
Adrian Roos [Tue, 12 Jul 2016 22:38:55 +0000 (15:38 -0700)]
Fix navigation bar order in seascape

This reverts the revert in commit c44368016a192dfe381f5f73c07be42e705e64db,
thus reapplying 27315acfbbf9921e760647e2e96e74ec7de6015a.

Also fixes the bug that was the reason this needed to be reverted and
fixes a case where the order was not correctly updated (landscape to
seascape or vice versa)

Fixes: 29612635
Change-Id: Id51cf7edaeeea16cba08bcd5a30313f58fa00d4d

8 years agoDon't show times before 2000-01-01
Damien Bargiacchi [Tue, 12 Jul 2016 22:53:40 +0000 (15:53 -0700)]
Don't show times before 2000-01-01

BUG=27802041

Change-Id: Iaa826e029c3b887e2bda6d12bc7c372d862ed320

8 years agoMerge "Don't hold lock calling into PackageMgr" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 22:52:28 +0000 (22:52 +0000)]
Merge "Don't hold lock calling into PackageMgr" into nyc-mr1-dev

8 years agoMerge "Explicitly flush compress/encrypt stream before close" into nyc-mr1-dev
Chris Tate [Tue, 12 Jul 2016 22:46:59 +0000 (22:46 +0000)]
Merge "Explicitly flush compress/encrypt stream before close" into nyc-mr1-dev

8 years agoWhen display is frozen prefer preserving orientation.
Robert Carr [Tue, 12 Jul 2016 21:14:49 +0000 (14:14 -0700)]
When display is frozen prefer preserving orientation.

While the display is frozen, we just want to preserve the orientation
from changing. Otherwise we will have strange loops as
SHOW_WHEN_LOCKED windows appear/dissapear over relaunch.

Bug: 29994732
Bug: 29542506
Bug: 29942346
Change-Id: Iec5f79db0cf5001c3c8e5d6a7a0136b758e0a934

8 years agoAllow LockPatternUtils usage on non-looper threads
Adrian Roos [Tue, 12 Jul 2016 22:31:55 +0000 (15:31 -0700)]
Allow LockPatternUtils usage on non-looper threads

Fixes an issue where LPU could no longer
be used on a non-looper thread even though
the looper is only used for a certain callback.

Now only using that callback mechanism is fatal
on a non-looper thread.

Change-Id: I2d766bd6c913e345ed6a3500b486263c8bc12b07
Fixes: 30076804

8 years agoFix docs for View.DRAG_FLAG_GLOBAL
Vladislav Kaznacheev [Tue, 12 Jul 2016 22:24:48 +0000 (15:24 -0700)]
Fix docs for View.DRAG_FLAG_GLOBAL

Document that cross-app drags only involve apps compiled for API 24 or later.

Bug: 30076806
Change-Id: Ia630f4623c23d787b52692ff1f6475408cefa177

8 years agoMerge "Don't backup & restore disabled shortcuts." into nyc-mr1-dev
Makoto Onuki [Tue, 12 Jul 2016 22:01:07 +0000 (22:01 +0000)]
Merge "Don't backup & restore disabled shortcuts." into nyc-mr1-dev

8 years agoMove grantDefaultPermissions back to onNewUserCreated
Fyodor Kupolov [Tue, 12 Jul 2016 21:46:19 +0000 (14:46 -0700)]
Move grantDefaultPermissions back to onNewUserCreated

Otherwise pre-grants may not work on managed profiles because apps could be
uninstalled when the user is started

Bug: 29955102
Change-Id: I8fafaf1ca6193c1a13bd2f0b463ee30fe473e6b5

8 years agoMerge "Do remove starting windows for activities in an invisible stack" into nyc...
TreeHugger Robot [Tue, 12 Jul 2016 21:32:36 +0000 (21:32 +0000)]
Merge "Do remove starting windows for activities in an invisible stack" into nyc-mr1-dev

8 years agoDo remove starting windows for activities in an invisible stack
Wale Ogunwale [Tue, 12 Jul 2016 17:29:12 +0000 (10:29 -0700)]
Do remove starting windows for activities in an invisible stack

Depending on app launch timing it is possible for the initializing
activity that is the top of an invisible stack to still have its
starting window visible since we skip removing orphaned starting
window for the top activity in a stack. We now remove starting
windows for all activities in an invisible stack.

Bug: 28173906
Change-Id: Ie5284c9681d06969f647cbe46a77dd072ca61435

8 years agoDon't hold lock calling into PackageMgr
Todd Kennedy [Tue, 12 Jul 2016 21:07:40 +0000 (14:07 -0700)]
Don't hold lock calling into PackageMgr

There's a subtle deadlock; when dumping state, we obtain the package manager
lock before trying to obtain the package installer session lock. Meanwhile,
creating a new session obtains the locks in the reverse -- the package
installer takes the package installer session lock and then tries to obtain
the package manager lock.

Here, we avoid holding the package installer session lock before we call
into the package manager. Alternatively, we could consider not holding the
package manager lock when dumping package installer state. But, given the
scope of the dumping logic, that's a bigger change with other, unknown
side effects.

Change-Id: I11f08484cd335bb7ad3bc557808eb48d14bd29cf
Fixes: 30089638

8 years agoMerge "Harden framework against backup transport crashes" into nyc-mr1-dev
Chris Tate [Tue, 12 Jul 2016 21:00:28 +0000 (21:00 +0000)]
Merge "Harden framework against backup transport crashes" into nyc-mr1-dev

8 years agoMerge "Prevent back button from being handled by app after waking device" into nyc...
Anthony Hugh [Tue, 12 Jul 2016 20:39:04 +0000 (20:39 +0000)]
Merge "Prevent back button from being handled by app after waking device" into nyc-mr1-dev

8 years agoFix issue #30013670: Phone AP crash when testing VT call
Dianne Hackborn [Tue, 12 Jul 2016 20:36:02 +0000 (13:36 -0700)]
Fix issue #30013670: Phone AP crash when testing VT call

Intent categories may be null.

Change-Id: Ic2e0438460741b264ddbfe77d2a14973f9af7d95

8 years agoMerge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\"...
Sudheer Shanka [Tue, 12 Jul 2016 20:01:06 +0000 (20:01 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours am: 6ae7a5f72b am: 322e70cef3 am: a730e5977e am: cbe258aa27  -s ours
am: 5b28589127

Change-Id: I1a8bfc2b3acb05edea636ba0c2e1eabaa83d8acb

8 years agoMerge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into...
Sudheer Shanka [Tue, 12 Jul 2016 20:01:04 +0000 (20:01 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195  -s ours am: 7975dd5b48 am: 008d66e49c am: e8458d8f88 am: 1bb51deaf4  -s ours
am: 5441a248f4

Change-Id: Ib4f04849819432248e069997659215ecf2840e67

8 years agoMerge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into...
Sudheer Shanka [Tue, 12 Jul 2016 19:52:48 +0000 (19:52 +0000)]
Merge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours am: 6ae7a5f72b am: 322e70cef3 am: a730e5977e
am: cbe258aa27  -s ours

Change-Id: I1cd45ce38ea1859fef073124cd3362076b2c33e4

8 years agoMerge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into...
Sudheer Shanka [Tue, 12 Jul 2016 19:52:44 +0000 (19:52 +0000)]
Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195  -s ours am: 7975dd5b48 am: 008d66e49c am: e8458d8f88
am: 1bb51deaf4  -s ours

Change-Id: I82e3b82dd260fef67e4c17156d9a868771e70e61

8 years agoMerge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into...
Sudheer Shanka [Tue, 12 Jul 2016 19:47:49 +0000 (19:47 +0000)]
Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours am: 6ae7a5f72b am: 322e70cef3
am: a730e5977e

Change-Id: Ic3f93423fed99fe6e1b1142e9f949866897954ae

8 years agoMerge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp...
Sudheer Shanka [Tue, 12 Jul 2016 19:47:44 +0000 (19:47 +0000)]
Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195  -s ours am: 7975dd5b48 am: 008d66e49c
am: e8458d8f88

Change-Id: If984b3437bc60d99e693907aef24f3b7b1218836

8 years agoMerge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp...
Sudheer Shanka [Tue, 12 Jul 2016 19:42:40 +0000 (19:42 +0000)]
Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours am: 6ae7a5f72b
am: 322e70cef3

Change-Id: I8c18ad1a029c13f1be022e12031f29d3cbba2220

8 years agoMerge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp...
Sudheer Shanka [Tue, 12 Jul 2016 19:42:38 +0000 (19:42 +0000)]
Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195  -s ours am: 7975dd5b48
am: 008d66e49c

Change-Id: I18ca4b24a2e18b122106027568cb92e3a10822ca

8 years agoMerge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp...
Sudheer Shanka [Tue, 12 Jul 2016 19:34:39 +0000 (19:34 +0000)]
Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours
am: 6ae7a5f72b

Change-Id: I89dd8c81075ebc85173c5fc37e8a4d1dfe312bbb

8 years agoMerge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-mr1...
Sudheer Shanka [Tue, 12 Jul 2016 19:34:38 +0000 (19:34 +0000)]
Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195  -s ours
am: 7975dd5b48

Change-Id: I343863180866b38af4f91a6f79068c21096e7ce0

8 years agoMerge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1...
Sudheer Shanka [Tue, 12 Jul 2016 19:27:39 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9
am: 76c9d70756  -s ours

Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68

8 years agoMerge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-mr1...
Sudheer Shanka [Tue, 12 Jul 2016 19:27:37 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e
am: fd0757f195  -s ours

Change-Id: I17b97d1cfefa769b07ea798c6f87f8af22a31329

8 years agoMerge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1...
Sudheer Shanka [Tue, 12 Jul 2016 19:20:38 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am: d327d73edf
am: cb7e0643c9

Change-Id: I42d732fcc3ed8745dcc35e433e066ee8babe3e42

8 years agoMerge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev...
Sudheer Shanka [Tue, 12 Jul 2016 19:20:34 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f
am: 177422c91e

Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16

8 years agoMerge "SysUI: Protect against crash in BatteryController" into nyc-mr1-dev
Jason Monk [Tue, 12 Jul 2016 19:18:50 +0000 (19:18 +0000)]
Merge "SysUI: Protect against crash in BatteryController" into nyc-mr1-dev

8 years agoMerge "Don't hold a lock while loading default wallpaper" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 19:18:07 +0000 (19:18 +0000)]
Merge "Don't hold a lock while loading default wallpaper" into nyc-mr1-dev

8 years agoMerge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:11:37 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev
am: d327d73edf

Change-Id: I131a01fb8d4ccd440a7727df2fde0ce433bc30d1

8 years agoMerge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:11:35 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
am: f1d9152f9f

Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96

8 years agoMerge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:03:18 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev

8 years agoMerge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:03:12 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev

8 years agoMerge "Back up / restore lock wallpapers" into nyc-mr1-dev
Chris Tate [Tue, 12 Jul 2016 18:56:45 +0000 (18:56 +0000)]
Merge "Back up / restore lock wallpapers" into nyc-mr1-dev

8 years agoMerge "Don't walk mutexed collections outside the mutex" into nyc-mr1-dev
Chris Tate [Tue, 12 Jul 2016 18:56:24 +0000 (18:56 +0000)]
Merge "Don't walk mutexed collections outside the mutex" into nyc-mr1-dev

8 years agoMerge "Fix up mangled SELinux labeling of wallpaper files" into nyc-mr1-dev
Chris Tate [Tue, 12 Jul 2016 18:56:19 +0000 (18:56 +0000)]
Merge "Fix up mangled SELinux labeling of wallpaper files" into nyc-mr1-dev

8 years agoBack up / restore lock wallpapers
Christopher Tate [Tue, 28 Jun 2016 23:38:40 +0000 (16:38 -0700)]
Back up / restore lock wallpapers

If writing both system + lock wallpapers winds up hitting the
transport-defined quota, the next backup operation steps back
to storing only the system wallpaper.

Also makes sure to unbind full-backup target agents following
the backup operation.  In practice this usually doesn't matter
because the target gets killed following the operation, but
the wallpaper agent runs in the system process where this does
not happen, so was mistakenly being left in place and reused
for the next operation, failing to re-run the full create +
backup lifecycle.

Bug 28968107

Change-Id: I219c2ddd7e899a430ef4cf693b1259464c15eed5

8 years agoAdded UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.
Mahaver Chopra [Thu, 7 Jul 2016 15:25:05 +0000 (16:25 +0100)]
Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.

Currently we used global setting to restrict user from enabling oem
unlock. As global settings can be chagned using adb, using user
restrictions instead.

Bug: 29893399
Change-Id: Ic83112a4838b8279bf50408a29ae205e0b8639ee

8 years agoMerge "Set up view state before attaching, jump drawables if needed" into nyc-mr1-dev
Alan Viverette [Tue, 12 Jul 2016 18:13:20 +0000 (18:13 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-mr1-dev

8 years agoMerge \"docs: Removed self-referencing links on Apps and Games pages.\" into nyc-dev
Kevin Hufnagle [Tue, 12 Jul 2016 17:54:26 +0000 (17:54 +0000)]
Merge \"docs: Removed self-referencing links on Apps and Games pages.\" into nyc-dev
am: 4c8d924d4c

Change-Id: I84f8209ce4c1f2a85c02398b3e7e7c30953cefd3

8 years agoMerge "docs: Removed self-referencing links on Apps and Games pages." into nyc-dev
Kevin Hufnagle [Tue, 12 Jul 2016 17:49:09 +0000 (17:49 +0000)]
Merge "docs: Removed self-referencing links on Apps and Games pages." into nyc-dev

8 years agoMerge "Merge \"Include new constant for encryption status in the getter\'s javadoc...
Android Build Merger (Role) [Tue, 12 Jul 2016 17:47:24 +0000 (17:47 +0000)]
Merge "Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev am: e278cf7665" into nyc-mr1-dev

8 years agoMerge "Improve jank on header change." into nyc-mr1-dev
Julia Reynolds [Tue, 12 Jul 2016 17:47:20 +0000 (17:47 +0000)]
Merge "Improve jank on header change." into nyc-mr1-dev

8 years agoMerge \"Include new constant for encryption status in the getter\'s javadoc\" into...
Amith Yamasani [Tue, 12 Jul 2016 17:46:58 +0000 (17:46 +0000)]
Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
am: e278cf7665

Change-Id: I22c884f8982d3a1aaf7baf1b981a3d3d8d8ab624

8 years agoMerge "Include new constant for encryption status in the getter's javadoc" into nyc-dev
Amith Yamasani [Tue, 12 Jul 2016 17:40:12 +0000 (17:40 +0000)]
Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev

8 years agoDon't hold a lock while loading default wallpaper
Fyodor Kupolov [Tue, 12 Jul 2016 17:32:08 +0000 (10:32 -0700)]
Don't hold a lock while loading default wallpaper

It currently causes lock contention during user switch, when instance of
WallpaperManager in SystemUI is accessed from multiple threads

Bug: 29039588
Change-Id: I4b827d54d10fbd3b188fb94f47e78a2967ecb480

8 years agoSysUI: Protect against crash in BatteryController
Jason Monk [Tue, 12 Jul 2016 17:34:12 +0000 (13:34 -0400)]
SysUI: Protect against crash in BatteryController

Change-Id: I850177b961b59b342dde4dbf67c018ac68a42960
Fixes: 30033957

8 years agoMerge "OpenSL-based audio support for BootAnimation" into nyc-mr1-dev
Geoffrey Pitsch [Tue, 12 Jul 2016 17:29:55 +0000 (17:29 +0000)]
Merge "OpenSL-based audio support for BootAnimation" into nyc-mr1-dev

8 years agoDon't backup & restore disabled shortcuts.
Makoto Onuki [Tue, 12 Jul 2016 16:18:50 +0000 (09:18 -0700)]
Don't backup & restore disabled shortcuts.

Also a backup & restore test where an app has manifest shortcuts.

Bug 30016960
Bug 29921267

Change-Id: I8c4c3ece50f26d778b2f8f42251c317eb25d1e14

8 years agoAdds a screenshot wallpaper method to WallpaperManagerService.
Zak Cohen [Mon, 11 Jul 2016 18:47:37 +0000 (19:47 +0100)]
Adds a screenshot wallpaper method to WallpaperManagerService.

Bug: 29963541

Change-Id: If0a574004f8bddf1ba170587a8187253fe045ef4

8 years agoMerge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev
Makoto Onuki [Tue, 12 Jul 2016 17:09:31 +0000 (17:09 +0000)]
Merge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev

8 years agoImprove jank on header change.
Julia Reynolds [Tue, 12 Jul 2016 15:30:28 +0000 (11:30 -0400)]
Improve jank on header change.

Also fix expand icon ripple.

Bug: 30070005
Change-Id: I0a139778f14d5ba4ebee6e27a321af3827ecbe96

8 years agoMerge "Guard against null object in scheduleNotifyUpdateAppWidgetLocked" into nyc...
Rubin Xu [Tue, 12 Jul 2016 16:37:54 +0000 (16:37 +0000)]
Merge "Guard against null object in scheduleNotifyUpdateAppWidgetLocked" into nyc-mr1-dev

8 years agoMerge "Add Group Id to PhoneAccount" into nyc-mr1-dev
Brad Ebinger [Tue, 12 Jul 2016 16:33:41 +0000 (16:33 +0000)]
Merge "Add Group Id to PhoneAccount" into nyc-mr1-dev

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Tue, 12 Jul 2016 16:29:30 +0000 (16:29 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: a2e1bb8c3e  -s ours

Change-Id: Iff3609179536b7e76d0f2a0b221636d86f7b6a51

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Tue, 12 Jul 2016 16:29:28 +0000 (16:29 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 84c67fa304  -s ours

Change-Id: I8da6418636bc11f64c226c8c3d995f7440ed04f7

8 years agoMerge \"docs: July 2016 Dashboard update\" into nyc-dev
Joe Fernandez [Tue, 12 Jul 2016 16:29:25 +0000 (16:29 +0000)]
Merge \"docs: July 2016 Dashboard update\" into nyc-dev
am: ba64d0ec2e

Change-Id: Idc78d3c900d6aef1ff78183bd3f187def98aed0c

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:19:06 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:59 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:41 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Merge \"App launch - Test app changes\" into nyc-dev am: 8fabbb89c0" into...
Android Build Merger (Role) [Tue, 12 Jul 2016 16:11:24 +0000 (16:11 +0000)]
Merge "Merge \"App launch - Test app changes\" into nyc-dev am: 8fabbb89c0" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:11 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge \"App launch - Test app changes\" into nyc-dev
Gopinath [Tue, 12 Jul 2016 16:11:01 +0000 (16:11 +0000)]
Merge \"App launch - Test app changes\" into nyc-dev
am: 8fabbb89c0

Change-Id: I0b14fe4a4dd9414d9fe9d15980e8058a7b3d9e29

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:10:11 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "docs: July 2016 Dashboard update" into nyc-dev
Joe Fernandez [Tue, 12 Jul 2016 16:09:53 +0000 (16:09 +0000)]
Merge "docs: July 2016 Dashboard update" into nyc-dev

8 years agodocs: July 2016 Dashboard update
Joe Fernandez [Tue, 12 Jul 2016 16:06:29 +0000 (09:06 -0700)]
docs: July 2016 Dashboard update

Change-Id: Ia2c6488340e7d17696ffe67ba120cb30bea94717

8 years agoMerge "App launch - Test app changes" into nyc-dev
Gopinath Elanchezhian [Tue, 12 Jul 2016 16:02:42 +0000 (16:02 +0000)]
Merge "App launch - Test app changes" into nyc-dev

8 years agoMerge "also log details for neko rename events" into nyc-mr1-dev
Chris Wren [Tue, 12 Jul 2016 15:16:03 +0000 (15:16 +0000)]
Merge "also log details for neko rename events" into nyc-mr1-dev

8 years agoGuard against null object in scheduleNotifyUpdateAppWidgetLocked
Rubin Xu [Tue, 12 Jul 2016 15:05:59 +0000 (16:05 +0100)]
Guard against null object in scheduleNotifyUpdateAppWidgetLocked

Bug: 30085290
Change-Id: I4f12e1def98dff7e50b4d25a7d23e81bdbe0b7bd

8 years agoMerge "Add an api to verify if ro.device_owner was set" into nyc-mr1-dev
Mahaver Chopra [Tue, 12 Jul 2016 09:48:00 +0000 (09:48 +0000)]
Merge "Add an api to verify if ro.device_owner was set" into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 12 Jul 2016 06:31:19 +0000 (23:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia5d623d602d07244fd92716ff53a126a6ccc299d
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 12 Jul 2016 06:21:45 +0000 (23:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: I336a5cd0babcb768a62375cb8d63afa7a7d9532c
Auto-generated-cl: translation import