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

161081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
dbbdb6d089 Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into lmp-mr1-dev 2016-07-29 21:50:33 +00:00
Sungsoo Lim
2dbb64594a DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours 
am: 6489d870d7  -s ours

Change-Id: I2631c56fbb3d7130b5389ed232c1a2fe0859b053
 2016-07-29 18:56:07 +00:00
Sungsoo Lim
6489d870d7 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 
am: f645010092  -s ours

Change-Id: Iad2f1d1a445e4891892f03294fed028b71f94368
 2016-07-29 18:45:45 +00:00
Sungsoo Lim
f645010092 DO NOT MERGE: Fix CTS regression am: df17644db7 
am: 057b548171

Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989
 2016-07-29 18:38:06 +00:00
Sungsoo Lim
057b548171 DO NOT MERGE: Fix CTS regression 
am: df17644db7

Change-Id: Id9bed3c68661176a72bcb606e0fc0a026173ac22
 2016-07-29 18:31:07 +00:00
Sudheer Shanka
7ef684713e DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. 
Bug: 29189712
Bug: 30317026
Bug: 30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
 2016-07-29 10:51:02 -07:00
Sungsoo Lim
7a92dc9d99 DO NOT MERGE: Fix CTS regression 
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
 2016-07-29 01:01:49 +00:00
Sungsoo Lim
df17644db7 DO NOT MERGE: Fix CTS regression 
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
 2016-07-29 00:56:16 +00:00
Paul Stewart
c92e93c47b Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 
am: 2e85e2ef26

Change-Id: If8a2f4e1fcbb4adf6e2ddef438781fb83de04cc3
 2016-07-20 00:37:53 +00:00
Paul Stewart
700c72d01d Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 
am: bf4f010a5b

Change-Id: I7e57c484be20197748c40c80acd987802b43a734
 2016-07-20 00:37:50 +00:00
Paul Stewart
e2a03026c4 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 
am: 141477b103

Change-Id: Ie4c9d06d225a2b99ebb4411e4282ea792c67d26b
 2016-07-20 00:37:44 +00:00
Paul Stewart
2e85e2ef26 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 
am: 58555ee891

Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9
 2016-07-20 00:31:29 +00:00
Paul Stewart
bf4f010a5b Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf 
am: 3fbe9280a4

Change-Id: Ib3bea7489d319bb94a41f3c8cb0d8ec7e40b14b7
 2016-07-20 00:31:22 +00:00
Paul Stewart
141477b103 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 
am: df93deccf9

Change-Id: Iaeae846189a8f5fa38c5da988eec7879300f8ab5
 2016-07-20 00:31:15 +00:00
Paul Stewart
58555ee891 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 
am: 2169197e28

Change-Id: I24f2c9f59336454aa071acca44d6aca5b44fda4a
 2016-07-20 00:25:20 +00:00
Paul Stewart
3fbe9280a4 Fix string equality comparison am: 1033c6fdbc 
am: fdd4fe53cf

Change-Id: Id179c734fc503abea1216e7c6057d4903a17f340
 2016-07-20 00:25:17 +00:00
Paul Stewart
df93deccf9 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 
am: fa4bbf4ad6

Change-Id: I3ec1ff70fdfc2fd2aabf22ad1b7b3dad27ad4674
 2016-07-20 00:25:14 +00:00
Paul Stewart
2169197e28 Merge changes Id25696e4,I939a12a2 into klp-dev 
am: 77b5526229

Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424
 2016-07-20 00:17:49 +00:00
Paul Stewart
fdd4fe53cf Fix string equality comparison 
am: 1033c6fdbc

Change-Id: I6503cb15fdc0741b6c6c2da9ee14057265f87545
 2016-07-20 00:17:47 +00:00
Paul Stewart
fa4bbf4ad6 WifiEnterpriseConfiguration: Do not print credentials in toString 
am: cc00f4d646

Change-Id: Iece2fd19363a3524746b01cf388566363d678431
 2016-07-20 00:17:43 +00:00
Paul Stewart
77b5526229 Merge changes Id25696e4,I939a12a2 into klp-dev 
* changes:
  Fix string equality comparison
  WifiEnterpriseConfiguration: Do not print credentials in toString
 2016-07-19 23:59:00 +00:00
Sungsoo Lim
6e0cedcaf6 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours 
am: 3900104379  -s ours

Change-Id: I552387a6fa24b4c5d913b15990bd22b117a2f0d6
 2016-07-19 00:45:32 +00:00
Sungsoo Lim
3900104379 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 
am: 710605dccf  -s ours

Change-Id: I6db9dc2b6da0505dacfcb84f6370d0b2903a3737
 2016-07-19 00:38:08 +00:00
Sungsoo Lim
710605dccf DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 
am: 3c979c6aa6

Change-Id: I1c11953ad5b8f3c14b77f1af12e572f04457a06b
 2016-07-19 00:32:38 +00:00
Sungsoo Lim
1ae841f508 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
am: 9fffc56cb1  -s ours

Change-Id: I97b8ce62b29aa41c0eee2a9dc7a1bb9985525c96
 2016-07-19 00:32:25 +00:00
Sungsoo Lim
3c979c6aa6 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
am: 8dbf0b5558

Change-Id: I451adfa75a6a95decbc4e16f50319fea50edbbed
 2016-07-19 00:23:32 +00:00
Sungsoo Lim
3261c5f7b3 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
Bug: 29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c
 2016-07-15 08:34:52 +00:00
Sungsoo Lim
9fffc56cb1 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
Bug: 29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c
 2016-07-15 08:34:38 +00:00
Sungsoo Lim
8dbf0b5558 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
Bug: 29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c
 2016-07-15 16:24:10 +09: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
863ac471cf DO NOT MERGE revert system api loadSafeLabel 
Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
 2016-07-06 17:05:32 -07: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
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
Paul Stewart
1033c6fdbc Fix string equality comparison 
Don't use "==" to compare strings.

Bug: 25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
 2016-06-30 11:58:38 -07:00
Paul Stewart
cc00f4d646 WifiEnterpriseConfiguration: Do not print credentials in toString 
BUG:25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
 2016-06-30 11:57:20 -07: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
96676a2d41 Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev 
am: b43fe62933  -s ours

Change-Id: Iad1cc5368a6617b648866cde91e51e5c0b8d68f5
 2016-06-21 22:12:17 +00:00
Sudheer Shanka
db7e70c2f0 Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev 
am: e64034a27d  -s ours

Change-Id: I1f1d3ae381040bf37bf23a40e6fdc17f842a13a1
 2016-06-21 22:12:15 +00:00
Sudheer Shanka
b43fe62933 Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-dev 2016-06-21 22:03:16 +00:00
Sudheer Shanka
e64034a27d Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-dev 2016-06-21 22:03:09 +00:00
Sudheer Shanka
8cc7430667 DO NOT MERGE: Add pm operation to set user restrictions. 
Bug: 29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
 2016-06-21 21:43:51 +00:00
Sudheer Shanka
65f53e1445 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-06-21 18:45:13 +00:00