OSDN Git Service
Sungsoo Lim [Fri, 29 Jul 2016 18:56:25 +0000 (18:56 +0000)]
DO NOT MERGE: Fix CTS regression am:
7a92dc9d99 am:
14abf736c8
am:
2df9864b54 -s ours
Change-Id: Ie0bc2aab0856dc6fae328571f5bc5938b43f9f49
Sungsoo Lim [Fri, 29 Jul 2016 18:50:25 +0000 (18:50 +0000)]
DO NOT MERGE: Fix CTS regression am:
7a92dc9d99
am:
14abf736c8
Change-Id: I2a35f4853aa450ccc68862c166b6139ce67a1aad
Sungsoo Lim [Fri, 29 Jul 2016 18:38:07 +0000 (18:38 +0000)]
DO NOT MERGE: Fix CTS regression
am:
7a92dc9d99
Change-Id: I13605f366810c158d380b11a814da8eac3e4e213
Sungsoo Lim [Mon, 25 Jul 2016 02:53:13 +0000 (11:53 +0900)]
DO NOT MERGE: Fix CTS regression
Bug:
30297223, Bug:
30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
Sungsoo Lim [Mon, 25 Jul 2016 02:53:13 +0000 (11:53 +0900)]
DO NOT MERGE: Fix CTS regression
Bug:
30297223, Bug:
30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
Benjamin Franz [Thu, 21 Jul 2016 09:59:41 +0000 (09:59 +0000)]
Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev
Paul Stewart [Wed, 20 Jul 2016 01:12:15 +0000 (01:12 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1
am:
0f9a968c0e
Change-Id: I5ef9b70287cd8b0beaa169f194e7011b8c354454
Paul Stewart [Wed, 20 Jul 2016 01:12:11 +0000 (01:12 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772
am:
6245774994
Change-Id: Ib82209c5c6b71f3c47feaa17c346f853288b0131
Paul Stewart [Wed, 20 Jul 2016 01:01:15 +0000 (01:01 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee
am:
701a6c1ed6
Change-Id: I34acfe2e2ab1da2615f5a7107a9879e7491b0857
Paul Stewart [Wed, 20 Jul 2016 00:54:33 +0000 (00:54 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b
am:
bb7439d8a1
Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0
Paul Stewart [Wed, 20 Jul 2016 00:54:27 +0000 (00:54 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d
am:
5d60d2f772
Change-Id: I1a0651d22571a4dec3b4b6ca97f6b62b930f1cc7
Paul Stewart [Wed, 20 Jul 2016 00:54:20 +0000 (00:54 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4
am:
e41e0064ee
Change-Id: I9582c9327b859c981cb75d6aad52bb5dd1fafe20
Paul Stewart [Wed, 20 Jul 2016 00:45:09 +0000 (00:45 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26
am:
c92e93c47b
Change-Id: I50ca54dc65b61cb2dbb550eb964bd50938595168
Paul Stewart [Wed, 20 Jul 2016 00:45:07 +0000 (00:45 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b
am:
700c72d01d
Change-Id: I6fc08163a75790e15d05ab952ad4e706a1391916
Paul Stewart [Wed, 20 Jul 2016 00:45:04 +0000 (00:45 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103
am:
e2a03026c4
Change-Id: Iba16c43199d5ab238ce129d37519f9c5a7ba2005
Paul Stewart [Wed, 20 Jul 2016 00:37:53 +0000 (00:37 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891
am:
2e85e2ef26
Change-Id: If8a2f4e1fcbb4adf6e2ddef438781fb83de04cc3
Paul Stewart [Wed, 20 Jul 2016 00:37:50 +0000 (00:37 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4
am:
bf4f010a5b
Change-Id: I7e57c484be20197748c40c80acd987802b43a734
Paul Stewart [Wed, 20 Jul 2016 00:37:44 +0000 (00:37 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9
am:
141477b103
Change-Id: Ie4c9d06d225a2b99ebb4411e4282ea792c67d26b
Paul Stewart [Wed, 20 Jul 2016 00:31:29 +0000 (00:31 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28
am:
58555ee891
Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9
Paul Stewart [Wed, 20 Jul 2016 00:31:22 +0000 (00:31 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf
am:
3fbe9280a4
Change-Id: Ib3bea7489d319bb94a41f3c8cb0d8ec7e40b14b7
Paul Stewart [Wed, 20 Jul 2016 00:31:15 +0000 (00:31 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6
am:
df93deccf9
Change-Id: Iaeae846189a8f5fa38c5da988eec7879300f8ab5
Paul Stewart [Wed, 20 Jul 2016 00:25:20 +0000 (00:25 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229
am:
2169197e28
Change-Id: I24f2c9f59336454aa071acca44d6aca5b44fda4a
Paul Stewart [Wed, 20 Jul 2016 00:25:17 +0000 (00:25 +0000)]
Fix string equality comparison am:
1033c6fdbc
am:
fdd4fe53cf
Change-Id: Id179c734fc503abea1216e7c6057d4903a17f340
Paul Stewart [Wed, 20 Jul 2016 00:25:14 +0000 (00:25 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646
am:
fa4bbf4ad6
Change-Id: I3ec1ff70fdfc2fd2aabf22ad1b7b3dad27ad4674
Paul Stewart [Wed, 20 Jul 2016 00:17:49 +0000 (00:17 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev
am:
77b5526229
Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424
Paul Stewart [Wed, 20 Jul 2016 00:17:47 +0000 (00:17 +0000)]
Fix string equality comparison
am:
1033c6fdbc
Change-Id: I6503cb15fdc0741b6c6c2da9ee14057265f87545
Paul Stewart [Wed, 20 Jul 2016 00:17:43 +0000 (00:17 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString
am:
cc00f4d646
Change-Id: Iece2fd19363a3524746b01cf388566363d678431
Paul Stewart [Tue, 19 Jul 2016 23:58:59 +0000 (23:58 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev
* changes:
Fix string equality comparison
WifiEnterpriseConfiguration: Do not print credentials in toString
Sungsoo Lim [Tue, 19 Jul 2016 01:12:12 +0000 (01:12 +0000)]
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
am:
407bb6ad53 -s ours
Change-Id: I461f779db4fdb5c5f9170c6bb3941c5269d980f2
Sungsoo Lim [Tue, 19 Jul 2016 01:08:02 +0000 (01:08 +0000)]
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
Sungsoo Lim [Tue, 19 Jul 2016 00:53:31 +0000 (00:53 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508 am:
82a7ad2b09
am:
4e192f9a04 -s ours
Change-Id: I074d9e6bf5d08b760fd428eca04d4812899555b0
Sungsoo Lim [Tue, 19 Jul 2016 00:53:30 +0000 (00:53 +0000)]
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
Sungsoo Lim [Tue, 19 Jul 2016 00:47:11 +0000 (00:47 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508
am:
82a7ad2b09
Change-Id: Ifb48dfec4944dfcdcbb1a7d5d36a30732fa058e6
Sungsoo Lim [Tue, 19 Jul 2016 00:46:25 +0000 (00:46 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161
am:
d35b114a35 -s ours
Change-Id: I33b922f13d4e9cfb6fdf2764f8e202eb38162e58
Sungsoo Lim [Tue, 19 Jul 2016 00:45:32 +0000 (00:45 +0000)]
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
Sungsoo Lim [Tue, 19 Jul 2016 00:40:46 +0000 (00:40 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3
am:
57aaad8161
Change-Id: I18e439f3f3bcea922ecbde678a24f926a9834698
Sungsoo Lim [Tue, 19 Jul 2016 00:40:42 +0000 (00:40 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours
am:
1ae841f508
Change-Id: I29059c5695717a1074ac068e613cce11ad78e9ad
Sungsoo Lim [Tue, 19 Jul 2016 00:38:08 +0000 (00:38 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
8dbf0b5558 am:
3c979c6aa6
am:
710605dccf -s ours
Change-Id: I6db9dc2b6da0505dacfcb84f6370d0b2903a3737
Sungsoo Lim [Tue, 19 Jul 2016 00:32:38 +0000 (00:32 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
8dbf0b5558
am:
3c979c6aa6
Change-Id: I1c11953ad5b8f3c14b77f1af12e572f04457a06b
Sungsoo Lim [Tue, 19 Jul 2016 00:32:25 +0000 (00:32 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am:
9fffc56cb1 -s ours
Change-Id: I97b8ce62b29aa41c0eee2a9dc7a1bb9985525c96
Sungsoo Lim [Tue, 19 Jul 2016 00:32:10 +0000 (00:32 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am:
3261c5f7b3
Change-Id: If30d5ca6ebdc2e81ea2206c321940a32998b5d78
Sungsoo Lim [Tue, 19 Jul 2016 00:23:32 +0000 (00:23 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am:
8dbf0b5558
Change-Id: I451adfa75a6a95decbc4e16f50319fea50edbbed
Sungsoo Lim [Tue, 19 Jul 2016 00:21:51 +0000 (00:21 +0000)]
Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface" into mnc-dev
Sungsoo Lim [Wed, 13 Jul 2016 00:31:16 +0000 (09:31 +0900)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
Bug:
29270469
Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f
Julia Reynolds [Fri, 15 Jul 2016 13:59:04 +0000 (13:59 +0000)]
Merge "Check caller's uid before allowing notification policy access." into mnc-dev
Sungsoo Lim [Thu, 14 Jul 2016 07:20:07 +0000 (16:20 +0900)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
Bug:
29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c
Sungsoo Lim [Thu, 14 Jul 2016 07:20:07 +0000 (16:20 +0900)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
Bug:
29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c
Sungsoo Lim [Thu, 14 Jul 2016 07:20:07 +0000 (16:20 +0900)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
Bug:
29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c
Benjamin Franz [Tue, 12 Jul 2016 14:20:47 +0000 (15:20 +0100)]
DO NOT MERGE Block the user from entering safe boot mode
Block the user from entering safe boot mode if the DISALLOW_SAFE_BOOT
policy is set.
Bug:
26251884
Change-Id: I4945d5d676928346c11ea305a5b6a2e1a42e94e6
Sergio Giro [Tue, 28 Jun 2016 17:26:10 +0000 (18:26 +0100)]
Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug:
29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit
4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
Sudheer Shanka [Tue, 12 Jul 2016 19:27:39 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9
am:
76c9d70756 -s ours
Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68
Sudheer Shanka [Tue, 12 Jul 2016 19:27:37 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e
am:
fd0757f195 -s ours
Change-Id: I17b97d1cfefa769b07ea798c6f87f8af22a31329
Sudheer Shanka [Tue, 12 Jul 2016 19:20:38 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am:
d327d73edf
am:
cb7e0643c9
Change-Id: I42d732fcc3ed8745dcc35e433e066ee8babe3e42
Sudheer Shanka [Tue, 12 Jul 2016 19:20:34 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am:
f1d9152f9f
am:
177422c91e
Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16
Sudheer Shanka [Tue, 12 Jul 2016 19:11:37 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev
am:
d327d73edf
Change-Id: I131a01fb8d4ccd440a7727df2fde0ce433bc30d1
Sudheer Shanka [Tue, 12 Jul 2016 19:11:35 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
am:
f1d9152f9f
Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96
Sudheer Shanka [Tue, 12 Jul 2016 19:03:18 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:03:12 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
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
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
DO NOT MERGE: Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
Julia Reynolds [Tue, 28 Jun 2016 19:16:21 +0000 (15:16 -0400)]
Check caller's uid before allowing notification policy access.
Bug:
29421441
Change-Id: I7460268595e932d54660b02007bcd68b95fe8aec
fionaxu [Thu, 7 Jul 2016 01:20:29 +0000 (01:20 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472
am:
b4849f8d74 -s ours
Change-Id: Id3089485c93309a4d1ee97e12aeda63c015f397a
fionaxu [Thu, 7 Jul 2016 01:13:47 +0000 (01:13 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf
am:
92b8cbd472
Change-Id: Ie23b6f96b4d624469f842c8822dc78f83c2d9714
fionaxu [Thu, 7 Jul 2016 01:07:43 +0000 (01:07 +0000)]
DO NOT MERGE revert system api loadSafeLabel
am:
863ac471cf
Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7
fionaxu [Thu, 30 Jun 2016 22:59:55 +0000 (15:59 -0700)]
DO NOT MERGE revert system api loadSafeLabel
Bug:
28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
Chen Xu [Wed, 6 Jul 2016 23:16:53 +0000 (23:16 +0000)]
Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev
Chen Xu [Fri, 1 Jul 2016 22:32:05 +0000 (22:32 +0000)]
Merge \\\\"DO NOT MERGE revert public api loadSafeLabel\\\\" into lmp-dev am:
521efcd1e3 -s ours am:
7bd0eea999 am:
0828455ca9
am:
caabaab8bc -s ours
Change-Id: If1a5d01375b2a4e503ddf93bba5e009754889d44
fionaxu [Fri, 1 Jul 2016 22:16:10 +0000 (22:16 +0000)]
Merge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am:
521efcd1e3 -s ours am:
7bd0eea999
am:
0828455ca9
Change-Id: Ie1d5e38af7c3c49eb69f61e379096b17dd004961
Chen Xu [Fri, 1 Jul 2016 22:09:39 +0000 (22:09 +0000)]
Merge \\"DO NOT MERGE revert public api loadSafeLabel\\" into lmp-dev am:
521efcd1e3 -s ours
am:
7bd0eea999
Change-Id: I4ae23825fcef45856aa8551725c38fba0dd4892a
fionaxu [Fri, 1 Jul 2016 21:59:03 +0000 (21:59 +0000)]
Merge \"DO NOT MERGE revert public api loadSafeLabel\" into lmp-dev
am:
521efcd1e3 -s ours
Change-Id: I278455eb32488b221de93acd52b64956149cad54
Chen Xu [Fri, 1 Jul 2016 21:44:05 +0000 (21:44 +0000)]
Merge "DO NOT MERGE revert public api loadSafeLabel" into lmp-dev
fionaxu [Thu, 30 Jun 2016 22:59:55 +0000 (15:59 -0700)]
DO NOT MERGE revert system api loadSafeLabel
Bug:
28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
fionaxu [Thu, 30 Jun 2016 23:06:21 +0000 (23:06 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33
am:
1e1974705b -s ours
Change-Id: Idbdf23dc9c74330080cf55a048d92b0dddafb99e
fionaxu [Thu, 30 Jun 2016 22:57:27 +0000 (22:57 +0000)]
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
fionaxu [Thu, 30 Jun 2016 22:51:55 +0000 (22:51 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours
am:
cbb7b8c7a4
Change-Id: Iad9b7ca53c003319a89dc3b7091bbbafb94a95dd
fionaxu [Thu, 30 Jun 2016 22:43:10 +0000 (22:43 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours
am:
f52501d2d4 -s ours
Change-Id: Ibc5076680df923f5edf2a09e4331b75604bd863f
fionaxu [Thu, 30 Jun 2016 22:37:24 +0000 (22:37 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909
am:
a3b851d352 -s ours
Change-Id: I914f9b17db4d515a8d962abb876a2847d2fab6b3
fionaxu [Thu, 30 Jun 2016 22:31:52 +0000 (22:31 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2
am:
a0263a9909
Change-Id: Iff18193574eeac7e9d0033025a4fff791ba9ccaa
fionaxu [Thu, 30 Jun 2016 22:25:47 +0000 (22:25 +0000)]
DO NOT MERGE revert public api loadSafeLabel
am:
f44c73abb2
Change-Id: If7d00ce5ba4955b3511e6bb46670c45927f9e5d2
Paul Stewart [Mon, 21 Mar 2016 16:51:27 +0000 (09:51 -0700)]
Fix string equality comparison
Don't use "==" to compare strings.
Bug:
25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
Paul Stewart [Wed, 11 Nov 2015 18:23:43 +0000 (10:23 -0800)]
WifiEnterpriseConfiguration: Do not print credentials in toString
BUG:
25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
fionaxu [Tue, 28 Jun 2016 07:43:35 +0000 (00:43 -0700)]
DO NOT MERGE revert public api loadSafeLabel
Bug:
28557603
Change-Id: I61f4939864228fb50112502044da599b9cec2430
fionaxu [Tue, 28 Jun 2016 05:52:56 +0000 (22:52 -0700)]
DO NOT MERGE revert public api loadSafeLabel
Bug:
28557603
Change-Id: Ic9d9ae0b59fe86f70aaea311380cacf222ee3a0c
Sudheer Shanka [Tue, 21 Jun 2016 22:36:46 +0000 (22:36 +0000)]
Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41 am:
a9b937b29d
am:
47da8a0bdc -s ours
Change-Id: Idf654d72b81e9f4c4219f2b7a5f14ba3be021438
Sudheer Shanka [Tue, 21 Jun 2016 22:36:43 +0000 (22:36 +0000)]
Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0 am:
e0cc5e20ae
am:
0d457d1254 -s ours
Change-Id: Idd92350e26a28821ddc2f9af505b28b5873a7f78
Sudheer Shanka [Tue, 21 Jun 2016 22:31:11 +0000 (22:31 +0000)]
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
Sudheer Shanka [Tue, 21 Jun 2016 22:31:09 +0000 (22:31 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0
am:
e0cc5e20ae
Change-Id: Ia32fa9009d31f280b7f71fd8ed472913c4aa30b6
Sudheer Shanka [Tue, 21 Jun 2016 22:25:34 +0000 (22:25 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-dev am:
b43fe62933 -s ours
am:
96676a2d41
Change-Id: I7a4cdbe7c6ed9abd51e0b172a24b69370edcc1b1
Sudheer Shanka [Tue, 21 Jun 2016 22:25:31 +0000 (22:25 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-dev am:
e64034a27d -s ours
am:
db7e70c2f0
Change-Id: I8ebc5346b9a8a38efa16f7bbd23ddaa97f3780e0
Sudheer Shanka [Tue, 21 Jun 2016 22:12:17 +0000 (22:12 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev
am:
b43fe62933 -s ours
Change-Id: Iad1cc5368a6617b648866cde91e51e5c0b8d68f5
Sudheer Shanka [Tue, 21 Jun 2016 22:12:15 +0000 (22:12 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev
am:
e64034a27d -s ours
Change-Id: I1f1d3ae381040bf37bf23a40e6fdc17f842a13a1
Sudheer Shanka [Tue, 21 Jun 2016 22:03:14 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:09 +0000 (22:03 +0000)]
Merge "Add pm operation to set user restrictions." into mnc-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:08 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:04 +0000 (22:03 +0000)]
Merge "Reduce shell power over user management." into mnc-dev
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
DO NOT MERGE: Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
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
Hall Liu [Mon, 20 Jun 2016 21:04:41 +0000 (21:04 +0000)]
Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into mnc-dev
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
Christopher Tate [Fri, 17 Jun 2016 00:15:14 +0000 (00:15 +0000)]
DO NOT MERGE: Don\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453
am:
2149ebeadf -s ours
Change-Id: I42300992feac56eb94ab71e160da5fa8fc04929a
OSDN Git Service
