206952 Commits

Author SHA1 Message Date
Sudheer Shanka
77f0b54c0b DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 8a8d7e7962 am: 2349d0dea5
am: 7559673a6d

Change-Id: I874a78978c631ed3060fcac1547b261537045d8c
2016-07-30 06:31:16 +00:00
Sudheer Shanka
7559673a6d DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 8a8d7e7962
am: 2349d0dea5

Change-Id: Id099c53df0a4a7c6996e546dfe6017b375f6d34e
2016-07-30 06:19:20 +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
Sungsoo Lim
49f14fa7e0 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 am: bfdf9592d0
am: 59cb7ab7b8

Change-Id: I166f91e72d1da65610d0f7d697dd70ddb9cfe96a
2016-07-29 20:10:28 +00:00
Sungsoo Lim
59cb7ab7b8 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
am: bfdf9592d0

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

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

Change-Id: I9fe008924b75ac7d348e0aa8c478f859a4ed743b
2016-07-29 19:24:37 +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
e71159c5f7 DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522
am: b04c428935

Change-Id: I5781e7822d050426288bbd42faafff31f098aa99
2016-07-29 19:02:43 +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
b04c428935 DO NOT MERGE: Fix CTS regression am: 90be39c7bb
am: db9f504522

Change-Id: I83a02495ec4116d2bc2001325037f5864bb92c9a
2016-07-29 18:50:29 +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
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
cb805b35f3 Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093
am: 87534f4ac9

Change-Id: I05e37f474e496b41c39b7a160418d9f48a265fa3
2016-07-21 10:14:59 +00:00
Benjamin Franz
87534f4ac9 Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am: 3e582390b3
am: 7abd7ba093

Change-Id: I8dd5c0934f135cd567ae6bf2f4edf759ed757dfe
2016-07-21 10:10:03 +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
a20314a28e Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165
am: 2331eefef7

Change-Id: Ia0cccdca5f4e44ad4caf75240240eec73757e22b
2016-07-20 01:35:14 +00:00
Paul Stewart
6b05e285cc Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437
am: 537535c14a

Change-Id: I0f9c27f32518f9c7bb1d3735741843178fc1dc02
2016-07-20 01:35:10 +00:00
Paul Stewart
2331eefef7 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac
am: a09b6ee165

Change-Id: I63a60f729f95f273bf1918689626ac83771c73ac
2016-07-20 01:28:54 +00:00
Paul Stewart
537535c14a Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3
am: b3ff6b4437

Change-Id: I51e07e2ab6b3bee89dada0b6bf1ce1bf52f78d2f
2016-07-20 01:28:52 +00:00
Paul Stewart
cf3595400b WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e am: c77f18b2a3
am: eef477c8b9

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

Change-Id: Id93c8ac53a78931c8fdba21b7c168e38a7ad7fe4
2016-07-20 01:20:08 +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