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

200841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
c2178ed1d9 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 am: f01ee1c291 -s ours 
am: 373492b076

Change-Id: Ibfc86e4b13fcc88c09b7ac74a7b0ddc4bd42dda7
 2016-07-30 06:21:04 +00:00
Sudheer Shanka
088e081ac1 Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into mnc-dev 
am: e140322bde

Change-Id: Idc3caa0c20f5d069ad6166f69d858ce8f6c99302
 2016-07-30 05:26:52 +00:00
Sudheer Shanka
2349d0dea5 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. 
am: 8a8d7e7962

Change-Id: Id3a971b538618801f97abe0bd1d03d11d2b8118c
 2016-07-30 05:26:51 +00:00
Sudheer Shanka
373492b076 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 
am: f01ee1c291  -s ours

Change-Id: I9bf603d8e6315552d8d00036aa67dc96e9ba678a
 2016-07-30 05:18:59 +00:00
Sudheer Shanka
f01ee1c291 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e 
am: 9f6bd40108

Change-Id: Id8afe281abcf8e9b07d7a92daacf922952273573
 2016-07-30 05:08:35 +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
Sudheer Shanka
e140322bde Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into mnc-dev 2016-07-29 21:50:38 +00:00
Sungsoo Lim
bfdf9592d0 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours 
am: e0316fc7a8

Change-Id: I0047256a9e88bedc24389de46c0e9f92430fe607
 2016-07-29 19:48:00 +00:00
Sungsoo Lim
e0316fc7a8 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e 
am: b8d3dd2472  -s ours

Change-Id: I3875a28849df618a392a88480271bf1ac8ef776e
 2016-07-29 19:35:54 +00:00
Sungsoo Lim
b8d3dd2472 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a 
am: b6a3e8ce8e

Change-Id: I51997dc68fc55e523050b4e642cdc4a22cd60f09
 2016-07-29 19:14:02 +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
25782fae9b DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours 
am: 0bbdc37b60

Change-Id: If4f25ea9d5a921fb264d67137fc0af05d84e614e
 2016-07-29 19:02:55 +00:00
Sungsoo Lim
0bbdc37b60 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 
am: 2df9864b54  -s ours

Change-Id: Ie0bc2aab0856dc6fae328571f5bc5938b43f9f49
 2016-07-29 18:56:25 +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
2df9864b54 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 
am: 14abf736c8

Change-Id: I2a35f4853aa450ccc68862c166b6139ce67a1aad
 2016-07-29 18:50:25 +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
db9f504522 DO NOT MERGE: Fix CTS regression 
am: 90be39c7bb

Change-Id: Ie32ddd18c9342b36b8d989ab4d715b30ff608949
 2016-07-29 18:32:49 +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
8a8d7e7962 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:55:06 -07: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
90be39c7bb DO NOT MERGE: Fix CTS regression 
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
 2016-07-29 01:02:27 +00: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
Benjamin Franz
7abd7ba093 Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev 
am: 3e582390b3

Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8
 2016-07-21 10:05:33 +00:00
Benjamin Franz
3e582390b3 Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev 2016-07-21 09:59:42 +00:00
Paul Stewart
a09b6ee165 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e 
am: 1e9889d5ac

Change-Id: Ie0bfc4653bfe90335952110b38be2eeee418f98f
 2016-07-20 01:19:50 +00:00
Paul Stewart
b3ff6b4437 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 
am: f8d4c187a3

Change-Id: If6d30364da0246233415bc15a1dda7c297f7bf6b
 2016-07-20 01:19:46 +00:00
Paul Stewart
1e9889d5ac Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 
am: 0f9a968c0e

Change-Id: I5ef9b70287cd8b0beaa169f194e7011b8c354454
 2016-07-20 01:12:15 +00:00
Paul Stewart
f8d4c187a3 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 
am: 6245774994

Change-Id: Ib82209c5c6b71f3c47feaa17c346f853288b0131
 2016-07-20 01:12:11 +00:00
Paul Stewart
c77f18b2a3 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 
am: d78a14531e

Change-Id: Id37927594f47a5a32b05b15c8e09df0fa4ea9569
 2016-07-20 01:11:49 +00:00
Paul Stewart
d78a14531e WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee 
am: 701a6c1ed6

Change-Id: I34acfe2e2ab1da2615f5a7107a9879e7491b0857
 2016-07-20 01:01:15 +00:00
Paul Stewart
0f9a968c0e Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b 
am: bb7439d8a1

Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0
 2016-07-20 00:54:33 +00:00
Paul Stewart
6245774994 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d 
am: 5d60d2f772

Change-Id: I1a0651d22571a4dec3b4b6ca97f6b62b930f1cc7
 2016-07-20 00:54:27 +00:00
Paul Stewart
701a6c1ed6 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 
am: e41e0064ee

Change-Id: I9582c9327b859c981cb75d6aad52bb5dd1fafe20
 2016-07-20 00:54:20 +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