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

178524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
407bb6ad53 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 
am: aa0ad336b6

Change-Id: I58f0e3ddfb4b5e5289e0d79602747de1dfd0106b
 2016-07-19 01:08:02 +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
4e192f9a04 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am: 1ae841f508 
am: 82a7ad2b09

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

Change-Id: I18e439f3f3bcea922ecbde678a24f926a9834698
 2016-07-19 00:40:46 +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
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
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
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
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
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
47da8a0bdc Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 
am: a9b937b29d

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

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

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

Change-Id: I8ebc5346b9a8a38efa16f7bbd23ddaa97f3780e0
 2016-06-21 22:25:31 +00:00