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

200766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sungsoo Lim
aa85bf99ee Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\" into mnc-dev 
am: f4710c174f

Change-Id: Ia8168af573a5aae66b75c11a2c18fd56e8addae3
 2016-07-19 00:32:24 +00:00
Sungsoo Lim
f4710c174f Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface" into mnc-dev 2016-07-19 00:21:53 +00:00
Sungsoo Lim
98287a6d54 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
Bug: 29270469
Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f
 2016-07-18 06:32:37 +00:00
Julia Reynolds
8e8bb6633c Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev 
am: 234e1c25e4

Change-Id: I6724832d28362a76cd2f65432d6e805738f335fa
 2016-07-15 14:06:49 +00:00
Julia Reynolds
234e1c25e4 Merge "Check caller's uid before allowing notification policy access." into mnc-dev 2016-07-15 13:59:06 +00:00
Sergio Giro
008120497b Add bound checks to utf16_to_utf8 
am: bce11021b2

Change-Id: Ic4995dee3763290f75b3ef623f257c71748d9d51
 2016-07-14 18:07:23 +00:00
Sergio Giro
bce11021b2 Add bound checks to utf16_to_utf8 
Test: ran libaapt2_tests64
Bug: 29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit 4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
 2016-07-14 16:37:18 +01: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
Julia Reynolds
f4811159f3 Check caller's uid before allowing notification policy access. 
Bug: 29421441
Change-Id: I7460268595e932d54660b02007bcd68b95fe8aec
 2016-07-11 05:13:08 +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
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
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
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
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
fionaxu
0fffbcb158 DO NOT MERGE revert public api loadSafeLabel 
Bug: 28557603
Change-Id: I61f4939864228fb50112502044da599b9cec2430
 2016-06-28 00:43:35 -07:00
fionaxu
f44c73abb2 DO NOT MERGE revert public api loadSafeLabel 
Bug: 28557603
Change-Id: Ic9d9ae0b59fe86f70aaea311380cacf222ee3a0c
 2016-06-27 23:52:19 -07:00
Sudheer Shanka
5e41f90a92 Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc -s ours 
am: e01775f0be

Change-Id: Ia4ac90dc59c50aabd1c3de69885c1312e37d915a
 2016-06-21 22:42:25 +00:00
Sudheer Shanka
06c3f60136 Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254 -s ours 
am: 199f6a490a

Change-Id: Ia9f6d50c60621431781986062491e7c3fbf92f94
 2016-06-21 22:42:23 +00:00
Sudheer Shanka
e01775f0be Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d 
am: 47da8a0bdc  -s ours

Change-Id: Idf654d72b81e9f4c4219f2b7a5f14ba3be021438
 2016-06-21 22:36:46 +00:00
Sudheer Shanka
199f6a490a Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae 
am: 0d457d1254  -s ours

Change-Id: Idd92350e26a28821ddc2f9af505b28b5873a7f78
 2016-06-21 22:36:43 +00:00