OSDN Git Service
Zak Cohen [Wed, 13 Jul 2016 10:22:02 +0000 (10:22 +0000)]
Merge \"Adds a screenshot wallpaper method to WallpaperManagerService.\" into nyc-mr1-dev
am:
b4d4ce31ab
Change-Id: I4737e4d758335240614d2d2b51c11b8c739160fc
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
Erik Kline [Wed, 13 Jul 2016 04:57:17 +0000 (04:57 +0000)]
Add IPv6 tethering coordinator
am:
1eb8c69bed
Change-Id: Icf8034276d4edc7167ad03ff8860ac8e3d05c464
Jaewan Kim [Wed, 13 Jul 2016 03:46:00 +0000 (12:46 +0900)]
Fix build
It's caused by my previous CL
6bd0363 resolve merge conflicts of
78120b0 to nyc-mr1-dev-plus-aosp
Change-Id: I57124b229945ebda3ea7a2fb6103e928cd9fd945
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
Andrii Kulian [Wed, 13 Jul 2016 02:32:44 +0000 (02:32 +0000)]
Merge \"Don\'t make redundant launch while updating configuration\" into nyc-mr1-dev
am:
4c7b339411
Change-Id: I84bce1a3980bf78eb20f7473b4cee687481d8bf2
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
Chris Thornton [Wed, 13 Jul 2016 02:09:12 +0000 (02:09 +0000)]
Merge \"Fix a few log messages that didn\'t have a space in the SoundTriggerTestApp\" into nyc-mr1-dev
am:
ea7999dc3f
Change-Id: I27952804de098e92c50907d47198dd747f272e31
Wei Jia [Wed, 13 Jul 2016 02:09:07 +0000 (02:09 +0000)]
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-mr1-dev
am:
e7982e05f6
Change-Id: I7376c0f985f1a625190481e134b24501e26ab7d2
Adrian Roos [Wed, 13 Jul 2016 02:09:03 +0000 (02:09 +0000)]
Merge \"Allow LockPatternUtils usage on non-looper threads\" into nyc-mr1-dev
am:
feaa2bfb39
Change-Id: I22afcc4e7307e3c64a92fdcef82f2d1344fbb5df
Robert Carr [Wed, 13 Jul 2016 02:08:58 +0000 (02:08 +0000)]
Merge \"When display is frozen prefer preserving orientation.\" into nyc-mr1-dev
am:
b6a77f4786
Change-Id: I08c34d4dd87ae9503337336a103cc048034bf4a2
Ben Lin [Wed, 13 Jul 2016 02:08:54 +0000 (02:08 +0000)]
Merge \"Trapping backspace at EditText level to prevent popping Docs.\" into nyc-mr1-dev
am:
2df618f4cd
Change-Id: I2f8a3c1d0c0c6a017e212288458429627f7c7544
Jaewan Kim [Wed, 13 Jul 2016 01:55:06 +0000 (10:55 +0900)]
resolve merge conflicts of
78120b0 to nyc-mr1-dev-plus-aosp
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
Wei Jia [Wed, 13 Jul 2016 01:48:07 +0000 (01:48 +0000)]
Merge "MediaDataSource: add DrmInitialization for IDataSource." 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
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
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
Android Build Merger (Role) [Wed, 13 Jul 2016 00:56:51 +0000 (00:56 +0000)]
Merge "Merge \\"docs: fix redirects for shareables\\" into nyc-dev am:
e181729b18 am:
2364699d3a" into nyc-mr1-dev-plus-aosp
Joe Fernandez [Wed, 13 Jul 2016 00:56:24 +0000 (00:56 +0000)]
Merge \\"docs: fix redirects for shareables\\" into nyc-dev am:
e181729b18
am:
2364699d3a
Change-Id: I859889d921dc93b0984829275d79e43d8be46692
Joe Fernandez [Wed, 13 Jul 2016 00:55:46 +0000 (00:55 +0000)]
Merge \\"docs: fix redirects for shareables\\" into nyc-dev am:
e181729b18
am:
b85297a182
Change-Id: Ifcae023b83ca1caea496a53728bb2e6b03c00397
Damien Bargiacchi [Wed, 13 Jul 2016 00:51:43 +0000 (00:51 +0000)]
Merge \"Don\'t show times before 2000-01-01\" into nyc-mr1-dev
am:
4786f6d958
Change-Id: Ic0eb9edf0cc94f62d808e214e19c8003dc9a7941
Jaewan Kim [Wed, 13 Jul 2016 00:46:06 +0000 (00:46 +0000)]
Merge "MediaSessionService: Support managed profile" into nyc-mr1-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
Joe Fernandez [Wed, 13 Jul 2016 00:44:36 +0000 (00:44 +0000)]
Merge \"docs: fix redirects for shareables\" into nyc-dev
am:
e181729b18
Change-Id: Ifc0ca35213e38efa516e070b1bf42fb29536d338
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
Joe Fernandez [Wed, 13 Jul 2016 00:37:11 +0000 (00:37 +0000)]
Merge "docs: fix redirects for shareables" into nyc-dev
David Christie [Wed, 13 Jul 2016 00:31:53 +0000 (00:31 +0000)]
Merge \"Fix issue where GnssMeasurements wouldn\'t allow empty measurements.\" into nyc-mr1-dev
am:
6441738f45
Change-Id: Ic127d17bde42fef81d6509fc408384c6f581687f
Kevin Gabayan [Wed, 13 Jul 2016 00:27:14 +0000 (00:27 +0000)]
Merge \"Wakelock timeout for AnyMotionDetector. Bug:
29959125\" into nyc-mr1-dev
am:
33759a993d
Change-Id: I9ca9b5835b0fbddca4447fcb8e6fc606880bf69e
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
Android Build Merger (Role) [Wed, 13 Jul 2016 00:18:22 +0000 (00:18 +0000)]
Merge "Fix docs for View.DRAG_FLAG_GLOBAL am:
9a44eaec53 am:
8496bb82d2" into nyc-mr1-dev-plus-aosp
Vladislav Kaznacheev [Wed, 13 Jul 2016 00:18:00 +0000 (00:18 +0000)]
Fix docs for View.DRAG_FLAG_GLOBAL am:
9a44eaec53
am:
8496bb82d2
Change-Id: Ia9b23c5412d44197ca0403f693931bf64e5c4790
Vladislav Kaznacheev [Wed, 13 Jul 2016 00:17:39 +0000 (00:17 +0000)]
Fix docs for View.DRAG_FLAG_GLOBAL am:
9a44eaec53
am:
9ac6a460c8
Change-Id: I62af5eba6621e25c51cbcbfe7f9670e7be1449a3
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
Kevin Gabayan [Wed, 13 Jul 2016 00:14:21 +0000 (00:14 +0000)]
Merge "Wakelock timeout for AnyMotionDetector. Bug:
29959125" into nyc-mr1-dev
Joe Fernandez [Wed, 13 Jul 2016 00:13:55 +0000 (17:13 -0700)]
docs: fix redirects for shareables
b/
30037099
Change-Id: I201b428d156a7f3eb49d92c6f5539b8f2c1998bb
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
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
Vladislav Kaznacheev [Wed, 13 Jul 2016 00:08:52 +0000 (00:08 +0000)]
Fix docs for View.DRAG_FLAG_GLOBAL
am:
9a44eaec53
Change-Id: I4b0548a4fb7bff0312d2cd73217f64f361216c50
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
Kevin Gabayan [Fri, 8 Jul 2016 17:41:24 +0000 (10:41 -0700)]
Wakelock timeout for AnyMotionDetector.
Bug:
29959125
Change-Id: I7260fd1640b87884bb550ff428eb9cd1dc111512
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
Dianne Hackborn [Tue, 12 Jul 2016 23:37:25 +0000 (23:37 +0000)]
Merge \"Fix issue #
30013670: Phone AP crash when testing VT call\" into nyc-mr1-dev
am:
ab1b52a0c4
Change-Id: I8c707c615ce3e74cd51db321581c0e7e123c0d95
Chris Thornton [Tue, 12 Jul 2016 23:37:18 +0000 (23:37 +0000)]
Merge \"SoundTriggerDetector should look at the return code to honour success\" into nyc-mr1-dev
am:
9b550cb188
Change-Id: Iafbd6b758768fc0f87651ac9086333fa74e07fdc
Fyodor Kupolov [Tue, 12 Jul 2016 23:37:08 +0000 (23:37 +0000)]
Merge \"Move grantDefaultPermissions back to onNewUserCreated\" into nyc-mr1-dev
am:
9cf5bf04d2
Change-Id: Id776e0b5f87bf5325a9bc48e198d168c9c555c18
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
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
TreeHugger Robot [Tue, 12 Jul 2016 23:22:43 +0000 (23:22 +0000)]
Merge "Move grantDefaultPermissions back to onNewUserCreated" into nyc-mr1-dev
Todd Kennedy [Tue, 12 Jul 2016 23:03:39 +0000 (23:03 +0000)]
Merge \"Don\'t hold lock calling into PackageMgr\" into nyc-mr1-dev
am:
c8967160aa
Change-Id: I9e4faf9115c35a7d2995ddc5ad82ed12df6f2a9b
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
Christopher Tate [Tue, 12 Jul 2016 22:58:27 +0000 (22:58 +0000)]
Merge \"Explicitly flush compress/encrypt stream before close\" into nyc-mr1-dev
am:
69818781f3
Change-Id: Ib31ffe531a4c6d27f10d1432c8ab68507c14abaf
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
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
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
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
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
Makoto Onuki [Tue, 12 Jul 2016 22:11:54 +0000 (22:11 +0000)]
Merge \"Don\'t backup & restore disabled shortcuts.\" into nyc-mr1-dev
am:
4885b274c1
Change-Id: I23c46fa144ac1b4989a4cd93cf442b812c7d1324
Makoto Onuki [Tue, 12 Jul 2016 22:01:07 +0000 (22:01 +0000)]
Merge "Don't backup & restore disabled shortcuts." into nyc-mr1-dev
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
Wale Ogunwale [Tue, 12 Jul 2016 21:38:22 +0000 (21:38 +0000)]
Merge \"Do remove starting windows for activities in an invisible stack\" into nyc-mr1-dev
am:
1ae277831d
Change-Id: If0e30f9f03a499d9ff5613268e2ea3311476ab3c
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
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
Christopher Tate [Tue, 12 Jul 2016 21:10:10 +0000 (21:10 +0000)]
Merge \"Harden framework against backup transport crashes\" into nyc-mr1-dev
am:
1165790f70
Change-Id: Icec9fab284cd476ffca3721d1d5f8eaaf1300ff8
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
Chris Tate [Tue, 12 Jul 2016 21:00:28 +0000 (21:00 +0000)]
Merge "Harden framework against backup transport crashes" into nyc-mr1-dev
Anthony Hugh [Tue, 12 Jul 2016 20:49:37 +0000 (20:49 +0000)]
Merge \"Prevent back button from being handled by app after waking device\" into nyc-mr1-dev
am:
1b7c5631c4
Change-Id: I0a0dae375e9528040483e4471d3093679a94533c
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
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
Android Build Merger (Role) [Tue, 12 Jul 2016 20:08:38 +0000 (20:08 +0000)]
Merge "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 am:
dbd5480ac4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jul 2016 20:08:26 +0000 (20:08 +0000)]
Merge "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 am:
903fb640c6" into nyc-mr1-dev-plus-aosp
Sudheer Shanka [Tue, 12 Jul 2016 20:08:03 +0000 (20:08 +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
am:
dbd5480ac4
Change-Id: I34c96ae206bcf3301f4151f4584e00bd1c1ce4f8
Sudheer Shanka [Tue, 12 Jul 2016 20:08:00 +0000 (20:08 +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
am:
903fb640c6
Change-Id: I8c118f5df4f8b8f1122628517ed9be9b10d918bb
Sudheer Shanka [Tue, 12 Jul 2016 20:06:53 +0000 (20:06 +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
am:
45393c8b85
Change-Id: Ied475a3054b317b91a5e10108f9a271b41e81422
Sudheer Shanka [Tue, 12 Jul 2016 20:06:51 +0000 (20:06 +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
am:
8fed0636c8
Change-Id: I79ef5d60a2357ad717cce1cb0e717a06dc785c52
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
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
Sudheer Shanka [Tue, 12 Jul 2016 19:59:12 +0000 (19:59 +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: Id67b945304514fb291021ad30835ecb8f04e0cfb
Sudheer Shanka [Tue, 12 Jul 2016 19:59:08 +0000 (19:59 +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: I2441f27ef71cd55f302821f429995414c997c222
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
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
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
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
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
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
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
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
Jason Monk [Tue, 12 Jul 2016 19:30:14 +0000 (19:30 +0000)]
Merge \"SysUI: Protect against crash in BatteryController\" into nyc-mr1-dev
am:
3750c9a15a
Change-Id: Idc0701fd53702bc2f0a4c4e4cb3173393cb24fa7
Fyodor Kupolov [Tue, 12 Jul 2016 19:30:08 +0000 (19:30 +0000)]
Merge \"Don\'t hold a lock while loading default wallpaper\" into nyc-mr1-dev
am:
2921dfac50
Change-Id: Iaa22bed019f30b340d7ef7011c2d8b14629efe33
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
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
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
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
Jason Monk [Tue, 12 Jul 2016 19:18:50 +0000 (19:18 +0000)]
Merge "SysUI: Protect against crash in BatteryController" 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
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
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
Christopher Tate [Tue, 12 Jul 2016 19:08:18 +0000 (19:08 +0000)]
Merge \"Back up / restore lock wallpapers\" into nyc-mr1-dev
am:
2917abeef2
Change-Id: I85f0dbff5a5b50e57892553ae36459dd7594d736
Christopher Tate [Tue, 12 Jul 2016 19:08:15 +0000 (19:08 +0000)]
Merge \"Don\'t walk mutexed collections outside the mutex\" into nyc-mr1-dev
am:
b9c057c316
Change-Id: I51a2f7324e96327a1d5e2f826544f03309412081
Christopher Tate [Tue, 12 Jul 2016 19:08:08 +0000 (19:08 +0000)]
Merge \"Fix up mangled SELinux labeling of wallpaper files\" into nyc-mr1-dev
am:
87488ac89b
Change-Id: Ib983d7f56e21ae61679edb89e5c2373c7e7c08d9
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