OSDN Git Service
TreeHugger Robot [Wed, 13 Jul 2016 22:37:30 +0000 (22:37 +0000)]
Merge "Make Recents button work in demo mode" into nyc-mr1-dev
Ashutosh Joshi [Wed, 13 Jul 2016 22:17:36 +0000 (22:17 +0000)]
Merge "Revert "Add state for loading/unloading apps"" into nyc-mr1-dev
Ashutosh Joshi [Wed, 13 Jul 2016 22:15:19 +0000 (22:15 +0000)]
Revert "Add state for loading/unloading apps"
This reverts commit
00b351aeef9c660cf3b1cfb3b24aae82d3fe2b8e.
Change-Id: Iee229adff8fec4f2407aa895886e63953f0d7d32
Wei Jia [Wed, 13 Jul 2016 22:04:58 +0000 (22:04 +0000)]
Merge "MediaPlayer: fix typo for OnInfoListener." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 22:00:37 +0000 (22:00 +0000)]
Merge "Fix disabling lockscreen for demo users." into nyc-mr1-dev
Ashutosh Joshi [Wed, 13 Jul 2016 21:51:30 +0000 (21:51 +0000)]
Merge "Add state for loading/unloading apps" into nyc-mr1-dev
Jean-Michel Trivi [Wed, 13 Jul 2016 21:50:57 +0000 (21:50 +0000)]
Merge "Optimize audio playback restriction check" into nyc-mr1-dev
Adrian Roos [Wed, 13 Jul 2016 21:34:14 +0000 (21:34 +0000)]
Merge "ApplicationErrorReport: Sanitize stack trace" into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 21:02:03 +0000 (21:02 +0000)]
Merge "sync rich comments back from google3" into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 20:58:23 +0000 (20:58 +0000)]
Merge "QS: Fix emergency calls only layout" into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 20:15:29 +0000 (20:15 +0000)]
Merge "Disallowing bluetooth config for demo users" into nyc-mr1-dev
Makoto Onuki [Wed, 13 Jul 2016 20:13:51 +0000 (20:13 +0000)]
Merge "Revert "Revert "Revert "Handle package broadcasts before apps do"""" into nyc-mr1-dev
Chong Zhang [Wed, 13 Jul 2016 19:39:07 +0000 (19:39 +0000)]
Merge "Revert changes to force layout after insets changes" into nyc-mr1-dev
Jean-Michel Trivi [Wed, 13 Jul 2016 18:25:21 +0000 (11:25 -0700)]
Optimize audio playback restriction check
Order the playback restriction checks from the most likely
restriction to the least likely.
Bug
30073948
Change-Id: I6431d15a2ed8b5831f937eab8db940d942082b0e
Ashutosh Joshi [Wed, 27 Apr 2016 18:19:16 +0000 (11:19 -0700)]
Add state for loading/unloading apps
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.
Bug:
29193948
Change-Id: I700f3bdbb8e84413455751dec02a812a639421b3
Chong Zhang [Wed, 13 Jul 2016 02:25:08 +0000 (19:25 -0700)]
Revert changes to force layout after insets changes
Alternative fix for b/
29391054 ag/
1152795 sends an MOVE message to
client which also force a layout, so we no longer need to force
it after the insets change in the traversal.
Reverting the following two related fixes as it does more
measures than necessary.
bug:
29391054
bug:
29533997
bug:
29634368
Revert "Fix layout issue after insets changed"
This reverts commit
76fdbb72c93a431e14357e0ea3d5a83edfa75c5e.
Revert "Do a forceLayout if pending insets is changed after relayout window"
This reverts commit
71f2c31469ed9628d744d20b86eaf188cfdf686d.
Ruben Brunk [Wed, 13 Jul 2016 19:02:25 +0000 (19:02 +0000)]
Merge "Include all components in VR initialization." into nyc-mr1-dev
Amith Yamasani [Wed, 13 Jul 2016 18:59:16 +0000 (11:59 -0700)]
Make Recents button work in demo mode
Create the UserSwitcherController object so that the broadcasts
are properly handled.
Change-Id: Iadf9588a4ddb7850f0d8ab2b49a0949fb4580893
Fixes:
30000641
Sudheer Shanka [Wed, 13 Jul 2016 18:58:37 +0000 (11:58 -0700)]
Fix disabling lockscreen for demo users.
LockSettingsService cleans up data for an user on receiving
ACTION_USER_ADDED. As a result, the value set by the
RetailDemoModeService was getting lost.
Bug:
29912660
Change-Id: I2414a5586ab0187bc003cd6ee8b9f1645406235f
Chris Wren [Wed, 13 Jul 2016 18:28:40 +0000 (14:28 -0400)]
sync rich comments back from google3
Bug:
30116535
Change-Id: I6e43ffda3d15b331c18752b5ee15770c6cdbfe85
Jason Monk [Wed, 13 Jul 2016 18:45:52 +0000 (14:45 -0400)]
QS: Fix emergency calls only layout
Change-Id: Ic66412b0c46f4436d63168a5e167d4adcad74283
Fixes:
29524397
Julia Reynolds [Wed, 13 Jul 2016 18:40:20 +0000 (18:40 +0000)]
Merge "Whitelist default apps for DND access." into nyc-mr1-dev
Victor Chang [Wed, 13 Jul 2016 18:36:35 +0000 (18:36 +0000)]
Merge "Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set" into nyc-mr1-dev
Kevin Hufnagle [Wed, 13 Jul 2016 18:06:44 +0000 (18:06 +0000)]
Merge \"docs: Added \"developer stories\" articles.\" into nyc-dev
am:
686996d2dc
Change-Id: I7a01c6f743c05c36c37eb5b742aaf756d13b9898
Kevin Hufnagle [Wed, 13 Jul 2016 17:52:24 +0000 (17:52 +0000)]
Merge "docs: Added "developer stories" articles." into nyc-dev
Makoto Onuki [Wed, 13 Jul 2016 17:25:25 +0000 (10:25 -0700)]
Revert "Revert "Revert "Handle package broadcasts before apps do"""
This reverts commit
886ba78dfb105eb45416587b73b6c6b336448de5.
With the tests updated.
Change-Id: I162e6ca23c667f90feddc1e9f42b554a416295cf
Adrian Roos [Fri, 1 Jul 2016 20:11:18 +0000 (13:11 -0700)]
ApplicationErrorReport: Sanitize stack trace
Makes sure that the size of the stack trace does not exceed
40 KiBi, to ensure that even errors with large stack traces
are properly reported to ActivityManagerService. For good
measure, also ensure that the exception message is not too
long either.
Change-Id: Id8a99094023c15a981b1b79fd9ee0d803921e220
Fixes:
29918978
Makoto Onuki [Wed, 13 Jul 2016 17:09:36 +0000 (17:09 +0000)]
Merge "Revert "Revert "Handle package broadcasts before apps do""" into nyc-mr1-dev
Makoto Onuki [Wed, 13 Jul 2016 17:08:26 +0000 (17:08 +0000)]
Revert "Revert "Handle package broadcasts before apps do""
This reverts commit
efbbe7ea9db8adab6bff407db1d7fc54bbaf31ee.
Change-Id: I3dbb080db5121307f533a7d411f4f5d47225500e
Adrian Roos [Wed, 13 Jul 2016 17:02:46 +0000 (17:02 +0000)]
Merge "Suppress immersive mode confirmation if navbar is empty" into nyc-mr1-dev
Julia Reynolds [Mon, 11 Jul 2016 12:50:58 +0000 (08:50 -0400)]
Whitelist default apps for DND access.
Bug:
29606962
Change-Id: I0a94004cf08a51ab17813f99aabddbceb95ac8f0
Usman Abdullah [Wed, 13 Jul 2016 16:39:10 +0000 (16:39 +0000)]
Merge "Grant Camera Permissions to DialerPackage" into nyc-mr1-dev
Makoto Onuki [Wed, 13 Jul 2016 16:33:38 +0000 (16:33 +0000)]
Merge "Revert "Handle package broadcasts before apps do"" into nyc-mr1-dev
Daniel Nishi [Wed, 13 Jul 2016 16:26:04 +0000 (16:26 +0000)]
Merge "Add a constant for when the storage manager is toggled on and off." into nyc-mr1-dev
Eric Laurent [Wed, 13 Jul 2016 15:54:02 +0000 (15:54 +0000)]
Merge "Make Dolby TrueHD audio format public" into nyc-mr1-dev
Julia Reynolds [Wed, 13 Jul 2016 15:26:01 +0000 (15:26 +0000)]
Merge "Attribute manual zen mode in volume panel footer." into nyc-mr1-dev
Victor Chang [Tue, 12 Jul 2016 22:47:29 +0000 (23:47 +0100)]
Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set
Fix:
29899712
Change-Id: I38cc9d0e584c3f2674c9ff1d91f77a11479d8943
Benjamin Franz [Wed, 13 Jul 2016 14:31:49 +0000 (14:31 +0000)]
Merge "Add hidden API to store whether provisioning config has been applied" 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
Julia Reynolds [Wed, 6 Jul 2016 13:47:45 +0000 (09:47 -0400)]
Attribute manual zen mode in volume panel footer.
So users know what app enabled DND.
Change-Id: I0aad862539b28302bf618641ad29cdfa956c8f33
Fixes:
29892371
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
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 [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:20:11 +0000 (02:20 +0000)]
Merge "Don't make redundant launch while updating configuration" into nyc-mr1-dev
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
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
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:21:19 +0000 (00:21 +0000)]
Merge "Fix issue where GnssMeasurements wouldn't allow empty measurements." into nyc-mr1-dev
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: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: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
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
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
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
Suprabh Shukla [Tue, 12 Jul 2016 22:35:37 +0000 (15:35 -0700)]
Disallowing bluetooth config for demo users
Bluetooth is currently not multi-user aware, so bluetooth pairings are
carrying across demo users. Have to disable bluetooth config to prevent
security risks in retail environments.
Bug:
30039481
Change-Id: I28ad0d9585a4e6e22af8772132d585c01b33abc9
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
Adrian Roos [Tue, 12 Jul 2016 22:27:24 +0000 (15:27 -0700)]
Suppress immersive mode confirmation if navbar is empty
Bug:
29501674
Change-Id: Icc5b02e378dfca9136a0d04f286926127fdec70d
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:01:07 +0000 (22:01 +0000)]
Merge "Don't backup & restore disabled shortcuts." into nyc-mr1-dev
Makoto Onuki [Tue, 12 Jul 2016 21:38:18 +0000 (14:38 -0700)]
Revert "Handle package broadcasts before apps do"
And fix b/
29939691 (don't try to load locked users) in a different way
Bug
29939691
Bug
29895275
Change-Id: Ib55f9c5d5547c54daa4e05c1e50bf4bbceaf1991
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
Wei Jia [Tue, 12 Jul 2016 21:38:50 +0000 (14:38 -0700)]
MediaPlayer: fix typo for OnInfoListener.
Bug:
30099323
Change-Id: Ic59fe64b4d2b6dcf28d31cb7c480ba6cb7a4cea1
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
Usman Abdullah [Tue, 12 Jul 2016 20:27:20 +0000 (13:27 -0700)]
Grant Camera Permissions to DialerPackage
The Dialer apps now need camera permissions because they support video
calling. Having the app ask for permission at runtime is not reasonable
because this is difficult to do in situations like:
- incoming video calls
- outging emergency video calls
It also would lead to a poor user experience in the scenario mentioned
above.
We already do this for a couple other permissions including microphone
permissions, and since the idea here is the same we are requesting camera
permissions for the dialer app as well to support video calling.
bug=
30036076
Change-Id: Ie2c1bdbcb97236e8497339512dcdb8d921641cf6
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
Daniel Nishi [Tue, 12 Jul 2016 20:55:57 +0000 (13:55 -0700)]
Add a constant for when the storage manager is toggled on and off.
Bug:
30095915
Change-Id: I9fef3ec47552d344cff51fc1f2cf2e02e9b51574
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
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: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
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