drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,848 Commits 1 Branch 0 Tags
Commit Graph

206848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
cbe258aa27 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
 2016-07-12 19:47:49 +00:00
Sudheer Shanka
1bb51deaf4 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
 2016-07-12 19:47:44 +00:00
Sudheer Shanka
a730e5977e 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
 2016-07-12 19:42:40 +00:00
Sudheer Shanka
e8458d8f88 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
 2016-07-12 19:42:38 +00:00
Sudheer Shanka
322e70cef3 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
 2016-07-12 19:34:39 +00:00
Sudheer Shanka
008d66e49c 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
 2016-07-12 19:34:38 +00:00
Sudheer Shanka
6ae7a5f72b 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
 2016-07-12 19:27:39 +00:00
Sudheer Shanka
7975dd5b48 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
 2016-07-12 19:27:37 +00:00
Sudheer Shanka
76c9d70756 Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am: d327d73edf 
am: cb7e0643c9

Change-Id: I42d732fcc3ed8745dcc35e433e066ee8babe3e42
 2016-07-12 19:20:38 +00:00
Sudheer Shanka
fd0757f195 Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f 
am: 177422c91e

Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16
 2016-07-12 19:20:34 +00:00
Sudheer Shanka
cb7e0643c9 Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev 
am: d327d73edf

Change-Id: I131a01fb8d4ccd440a7727df2fde0ce433bc30d1
 2016-07-12 19:11:37 +00:00
Sudheer Shanka
177422c91e Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev 
am: f1d9152f9f

Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96
 2016-07-12 19:11:35 +00:00
Sudheer Shanka
d327d73edf Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev 2016-07-12 19:03:20 +00:00
Sudheer Shanka
f1d9152f9f Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev 2016-07-12 19:03:14 +00:00
Sudheer Shanka
3f12e8e2bf DO NOT MERGE: Reduce shell power over user management. 
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.

Bug: 29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
 2016-07-12 01:59:08 +00:00
Sudheer Shanka
20d5bb8be8 DO NOT MERGE: Add pm operation to set user restrictions. 
Bug: 29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
 2016-07-12 01:58:39 +00:00
fionaxu
aad33e6905 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa am: f6923d2993 
am: 50904bedb5

Change-Id: I733cc2b3421780398a2a764748c9d9155c39327b
 2016-07-07 01:47:45 +00:00
fionaxu
50904bedb5 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa 
am: f6923d2993

Change-Id: If22f635f2e4cf0a3ce79ef6916abe3cb60c6b419
 2016-07-07 01:39:09 +00:00
fionaxu
f6923d2993 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours 
am: d061c3abfa

Change-Id: Ia6af0a650e4fe0afdcf56ecee7473be2cdef7b32
 2016-07-07 01:32:07 +00:00
fionaxu
d061c3abfa DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 
am: b4849f8d74  -s ours

Change-Id: Id3089485c93309a4d1ee97e12aeda63c015f397a
 2016-07-07 01:20:29 +00:00
fionaxu
b4849f8d74 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf 
am: 92b8cbd472

Change-Id: Ie23b6f96b4d624469f842c8822dc78f83c2d9714
 2016-07-07 01:13:47 +00:00
fionaxu
92b8cbd472 DO NOT MERGE revert system api loadSafeLabel 
am: 863ac471cf

Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7
 2016-07-07 01:07:43 +00:00
fionaxu
863ac471cf DO NOT MERGE revert system api loadSafeLabel 
Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
 2016-07-06 17:05:32 -07:00
fionaxu
e5643a13c4 Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 
am: 69a071e55c

Change-Id: If59d61dfdc00f740ffcf8fbe5233b191eb03a797
 2016-07-06 23:36:00 +00:00
Chen Xu
69a071e55c Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am: d2e2288fe3 
am: 59fc768893

Change-Id: I1eeb704e6b0a29e3574e969649ba72bbb5d9a9c2
 2016-07-06 23:29:51 +00:00
fionaxu
59fc768893 Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev 
am: d2e2288fe3

Change-Id: If7bb704d5d6ae942b7ceac3e9f22acf4cf3a7b4b
 2016-07-06 23:24:04 +00:00
Chen Xu
d2e2288fe3 Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev 2016-07-06 23:16:55 +00:00
fionaxu
4000bdb3ea Merge \\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\" into lmp-dev am: 521efcd1e3 -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc -s ours am: 67f8e822ac am: f82ca1f3e9 
am: 0f741391c3

Change-Id: I9748b9d7b065a6d2bbd9c2a3061409c58b53d261
 2016-07-01 22:55:45 +00:00
Chen Xu
0f741391c3 Merge \\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\" into lmp-dev am: 521efcd1e3 -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc -s ours am: 67f8e822ac 
am: f82ca1f3e9

Change-Id: Ib714c74aa3bede2bea496204b7d1cb7ff2380dca
 2016-07-01 22:45:46 +00:00
fionaxu
f82ca1f3e9 Merge \\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\" into lmp-dev am: 521efcd1e3 -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc -s ours 
am: 67f8e822ac

Change-Id: I54214d329e81a59e418cc9f4a5ff150b6348a8c2
 2016-07-01 22:38:28 +00:00
Chen Xu
67f8e822ac Merge \\\\"DO NOT MERGE revert public api loadSafeLabel\\\\" into lmp-dev am: 521efcd1e3 -s ours am: 7bd0eea999 am: 0828455ca9 
am: caabaab8bc  -s ours

Change-Id: If1a5d01375b2a4e503ddf93bba5e009754889d44
 2016-07-01 22:32:05 +00:00
fionaxu
caabaab8bc Merge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am: 521efcd1e3 -s ours am: 7bd0eea999 
am: 0828455ca9

Change-Id: Ie1d5e38af7c3c49eb69f61e379096b17dd004961
 2016-07-01 22:16:10 +00:00
Chen Xu
0828455ca9 Merge \\"DO NOT MERGE revert public api loadSafeLabel\\" into lmp-dev am: 521efcd1e3 -s ours 
am: 7bd0eea999

Change-Id: I4ae23825fcef45856aa8551725c38fba0dd4892a
 2016-07-01 22:09:39 +00:00
fionaxu
7bd0eea999 Merge \"DO NOT MERGE revert public api loadSafeLabel\" into lmp-dev 
am: 521efcd1e3  -s ours

Change-Id: I278455eb32488b221de93acd52b64956149cad54
 2016-07-01 21:59:03 +00:00
Chen Xu
521efcd1e3 Merge "DO NOT MERGE revert public api loadSafeLabel" into lmp-dev 2016-07-01 21:44:06 +00:00
Julia Reynolds
005394cd01 Merge \\"Always apply config updates.\\" into mnc-dr-dev am: f437bd068c 
am: 2a44859c21

Change-Id: I1462c5cc78001f6be749f518c861c7fcc771f90f
 2016-07-01 15:31:52 +00:00
Julia Reynolds
2a44859c21 Merge \"Always apply config updates.\" into mnc-dr-dev 
am: f437bd068c

Change-Id: I899b923c075a5f3351c4791a23a94adf123d1247
 2016-07-01 15:26:58 +00:00
Julia Reynolds
f437bd068c Merge "Always apply config updates." into mnc-dr-dev 2016-07-01 15:21:24 +00:00
fionaxu
99973d9852 DO NOT MERGE revert system api loadSafeLabel 
Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
 2016-06-30 17:57:46 -07:00
fionaxu
17414d65fa DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352 -s ours am: f52501d2d4 -s ours am: cbb7b8c7a4 am: c666ebef33 am: 1e1974705b -s ours am: c7824b3de3 am: 0b2c2b2a8c 
am: b281795c12

Change-Id: I666bfd00c747b43ef07f90b8ef61b8fe79470312
 2016-06-30 23:26:56 +00:00
fionaxu
b281795c12 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352 -s ours am: f52501d2d4 -s ours am: cbb7b8c7a4 am: c666ebef33 am: 1e1974705b -s ours am: c7824b3de3 
am: 0b2c2b2a8c

Change-Id: I49b57d13076a736f674434403ac2470680fe398a
 2016-06-30 23:19:16 +00:00
fionaxu
0b2c2b2a8c DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352 -s ours am: f52501d2d4 -s ours am: cbb7b8c7a4 am: c666ebef33 am: 1e1974705b -s ours 
am: c7824b3de3

Change-Id: I89dc27d498872a0e4ce539b293f3ffa9f74e38e9
 2016-06-30 23:11:22 +00:00
fionaxu
c7824b3de3 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352 -s ours am: f52501d2d4 -s ours am: cbb7b8c7a4 am: c666ebef33 
am: 1e1974705b  -s ours

Change-Id: Idbdf23dc9c74330080cf55a048d92b0dddafb99e
 2016-06-30 23:06:21 +00:00
fionaxu
1e1974705b DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352 -s ours am: f52501d2d4 -s ours am: cbb7b8c7a4 
am: c666ebef33

Change-Id: I8b40b7fbf1c6b2e9fa556c6fc31d81b98e291fdf
 2016-06-30 22:57:27 +00:00
fionaxu
c666ebef33 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352 -s ours am: f52501d2d4 -s ours 
am: cbb7b8c7a4

Change-Id: Iad9b7ca53c003319a89dc3b7091bbbafb94a95dd
 2016-06-30 22:51:55 +00:00
fionaxu
cbb7b8c7a4 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352 -s ours 
am: f52501d2d4  -s ours

Change-Id: Ibc5076680df923f5edf2a09e4331b75604bd863f
 2016-06-30 22:43:10 +00:00
fionaxu
f52501d2d4 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 
am: a3b851d352  -s ours

Change-Id: I914f9b17db4d515a8d962abb876a2847d2fab6b3
 2016-06-30 22:37:24 +00:00
fionaxu
a3b851d352 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 
am: a0263a9909

Change-Id: Iff18193574eeac7e9d0033025a4fff791ba9ccaa
 2016-06-30 22:31:52 +00:00
fionaxu
a0263a9909 DO NOT MERGE revert public api loadSafeLabel 
am: f44c73abb2

Change-Id: If7d00ce5ba4955b3511e6bb46670c45927f9e5d2
 2016-06-30 22:25:47 +00:00
Julia Reynolds
81a560a90d Always apply config updates. 
In case the config and global settings are mismatched.

Bug: 29617474
Change-Id: I3a3ae338dce45c7c7e579d56f6d05b581e0dd8f7
 2016-06-28 14:08:17 -04:00