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

164620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sungsoo Lim
f928b8062c DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours 
am: 0fb1075d95

Change-Id: I1a019156b580ec594afbb866bb7aec342de8e636
 2016-07-30 05:40:52 +00:00
Sudheer Shanka
9ed6bd83ff Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into lmp-mr1-dev 
am: dbbdb6d089

Change-Id: I53e854c96f9bf68855ea949a640c4701e0b2ba5e
 2016-07-30 04:54:27 +00:00
Sudheer Shanka
9f6bd40108 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. 
am: 7ef684713e

Change-Id: I0a9fa6126709e9cf3d3be7653f48503613d10f27
 2016-07-30 04:54:25 +00:00
Sungsoo Lim
0fb1075d95 DO NOT MERGE: Fix CTS regression 
am: edc9238514  -s ours

Change-Id: If11ad6b402e48aebcce8afc6d5f6093bde539a6e
 2016-07-30 04:44:16 +00:00
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
b6a3e8ce8e DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours 
am: 2dbb64594a

Change-Id: I04df61df1a926dbfe42d22127bdd4baabe7235d4
 2016-07-29 19:03:14 +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
14abf736c8 DO NOT MERGE: Fix CTS regression 
am: 7a92dc9d99

Change-Id: I13605f366810c158d380b11a814da8eac3e4e213
 2016-07-29 18:38:07 +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
edc9238514 DO NOT MERGE: Fix CTS regression 
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
 2016-07-29 01:00:22 +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
bb7439d8a1 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 
am: c92e93c47b

Change-Id: I50ca54dc65b61cb2dbb550eb964bd50938595168
 2016-07-20 00:45:09 +00:00
Paul Stewart
5d60d2f772 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b 
am: 700c72d01d

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

Change-Id: Iba16c43199d5ab238ce129d37519f9c5a7ba2005
 2016-07-20 00:45:04 +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
aa0ad336b6 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours 
am: 6e0cedcaf6

Change-Id: Icd142cfe2b224c2f1c5c56175b955d9c65fbe195
 2016-07-19 00:53:30 +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
82a7ad2b09 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours 
am: 1ae841f508

Change-Id: I29059c5695717a1074ac068e613cce11ad78e9ad
 2016-07-19 00:40:42 +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
57aaad8161 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
am: 3261c5f7b3

Change-Id: If30d5ca6ebdc2e81ea2206c321940a32998b5d78
 2016-07-19 00:32:10 +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
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
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