OSDN Git Service
Sudheer Shanka [Fri, 19 Aug 2016 18:01:17 +0000 (18:01 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours
am:
f368bdee06
Change-Id: I56d187b0466e674e423754818ba51ca0cdd61a3c
Amith Yamasani [Fri, 19 Aug 2016 17:31:47 +0000 (17:31 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours
am:
9be12f8986
Change-Id: Ie692388b7c4ad6492444347ac128d8cf83dd9e21
Sudheer Shanka [Fri, 19 Aug 2016 17:31:43 +0000 (17:31 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev
am:
5e55214ab7
Change-Id: If6174229b0b6d378b7cf6c5f5618ce70d04c400b
Amith Yamasani [Fri, 19 Aug 2016 17:31:39 +0000 (17:31 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
b02862c2cf
Change-Id: Id89010f4bf96a43ef9f97488353fbdf89c6f2931
Sudheer Shanka [Fri, 19 Aug 2016 17:11:30 +0000 (17:11 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev
am:
96052ea905 -s ours
Change-Id: I6d7353ed5154dfa3c6d556e4701c8c8e4f66feac
Amith Yamasani [Fri, 19 Aug 2016 17:11:28 +0000 (17:11 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
a92810a189 -s ours
Change-Id: Ic25323f818ee224640686c4e1d6c3b3f62ff828f
Sudheer Shanka [Fri, 19 Aug 2016 17:06:58 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:56 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev
Narayan Kamath [Thu, 18 Aug 2016 10:30:00 +0000 (10:30 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47 am:
efab128e67
am:
86437ec433
Change-Id: If18135c4aebd55fa9a1f08e275dbfef3dc433b5e
Narayan Kamath [Thu, 18 Aug 2016 10:29:55 +0000 (10:29 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours am:
2984748753
am:
b9fae65605
Change-Id: I3df204c005d61091f83e6ee2bd6bcd2a63a68c2b
Narayan Kamath [Thu, 18 Aug 2016 10:23:23 +0000 (10:23 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47
am:
efab128e67
Change-Id: I7159b2996f35311a630cdb7b2646c0e94d159c1f
Narayan Kamath [Thu, 18 Aug 2016 10:23:20 +0000 (10:23 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours
am:
2984748753
Change-Id: Id9f73afcbc747e3e341c5cfa665e4929747fdbac
Narayan Kamath [Thu, 18 Aug 2016 10:19:28 +0000 (10:19 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87
am:
4cf5241f47
Change-Id: Ibd736c16c8af9397e774c5abb917a9a3d31681a0
Narayan Kamath [Thu, 18 Aug 2016 10:16:48 +0000 (10:16 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108
am:
b56f4f53e1 -s ours
Change-Id: I67e1ff67c88d8c70a9d6d0698c857be77f09f534
Narayan Kamath [Thu, 18 Aug 2016 09:58:45 +0000 (09:58 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0
am:
1bd43c162f
Change-Id: Ic38c43db48584b3d899e120fd65a4058d806a39f
Narayan Kamath [Thu, 18 Aug 2016 09:56:29 +0000 (09:56 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2
am:
8fdee85e87
Change-Id: I654191bebb88a8005e9f46ad8b8b1f932214b3c9
Narayan Kamath [Thu, 18 Aug 2016 09:56:24 +0000 (09:56 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284
am:
b85e9e9108
Change-Id: Ie4874c088e05f4f5bc2073661010d413e60b3f7b
Narayan Kamath [Thu, 18 Aug 2016 09:53:12 +0000 (09:53 +0000)]
Process: Fix communication with zygote.
am:
e29c6493c0
Change-Id: I86b073f7f69943911aa0bea782e29ae6d86609a2
Narayan Kamath [Thu, 18 Aug 2016 09:50:56 +0000 (09:50 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev
am:
6829cf28e2
Change-Id: I740364ba90a8d1f14a5b2d2aacfe44948a4583d2
Narayan Kamath [Thu, 18 Aug 2016 09:50:52 +0000 (09:50 +0000)]
Process: Fix communication with zygote.
am:
8e69dd2284
Change-Id: I3860d3f66e256a6446df5d8ce20f752d1c002e0f
Narayan Kamath [Thu, 18 Aug 2016 09:46:17 +0000 (09:46 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev
Narayan Kamath [Tue, 9 Aug 2016 16:00:25 +0000 (17:00 +0100)]
Process: Fix communication with zygote.
Don't write partial requests, and don't return (or throw) early after
partially reading a response.
bug:
30143607
(cherry-picked from commit
448be0a62209c977593d81617853a8a428d013df)
Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
Narayan Kamath [Tue, 9 Aug 2016 16:00:25 +0000 (17:00 +0100)]
Process: Fix communication with zygote.
Don't write partial requests, and don't return (or throw) early after
partially reading a response.
bug:
30143607
(cherry-picked from commit
448be0a62209c977593d81617853a8a428d013df)
Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug:
30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug:
30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
David Christie [Fri, 12 Aug 2016 20:17:03 +0000 (20:17 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1
am:
62783bde30
Change-Id: I466311d2aa3983e690778fb1084f93eab7e8ae7d
David Christie [Fri, 12 Aug 2016 20:17:00 +0000 (20:17 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2
am:
b7f8b59e24
Change-Id: I26eda3647447490d58777d9fd8b2055ab8574e5e
David Christie [Fri, 12 Aug 2016 20:09:56 +0000 (20:09 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a
am:
655361b2b1
Change-Id: I39e11f906f059cf8bb1ea861490a0e9051d11bed
David Christie [Fri, 12 Aug 2016 20:09:54 +0000 (20:09 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev
am:
288166cbb2
Change-Id: Ie8927cbe2b224241f8d896487ff17117c15c0255
David Christie [Fri, 12 Aug 2016 19:56:57 +0000 (19:56 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676
am:
5a6b11114a
Change-Id: Ie2c2290014481772cf10c5f9e4fc565bf06e74a3
David Christie [Thu, 11 Aug 2016 20:06:08 +0000 (13:06 -0700)]
resolve merge conflicts of
b4a5615 to lmp-dev
Change-Id: I1b9ebc398226ead9d7f494c4ac56a7b1d9d6586f
David Christie [Thu, 11 Aug 2016 18:33:18 +0000 (18:33 +0000)]
Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864" into klp-dev am:
df7bd91dfa
am:
b9fe170c6a
Change-Id: I3e320844622617d9ae63fea4cc3a34f9f0e1e93a
David Christie [Thu, 11 Aug 2016 18:33:15 +0000 (18:33 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923
am:
3462e52676
Change-Id: I45779f683b417fe2d3cd4f7702d07a9cd13bd6f0
David Christie [Thu, 11 Aug 2016 18:27:26 +0000 (18:27 +0000)]
Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864" into klp-dev
am:
df7bd91dfa
Change-Id: Idec27e5beca07ace75b08de5ce0b6ee8bf1ab7f7
David Christie [Thu, 11 Aug 2016 18:27:22 +0000 (18:27 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864
am:
dde12c6923
Change-Id: I772d5b997df579d3611eafc7542aeee2d690f946
David Christie [Thu, 11 Aug 2016 18:15:29 +0000 (18:15 +0000)]
Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864" into klp-dev
Sungsoo Lim [Sat, 30 Jul 2016 05:40:55 +0000 (05:40 +0000)]
Merge \\"DO NOT MERGE: Fix CTS regression\\" into lmp-dev am:
124cc534f8 -s ours
am:
3d58e326d9
Change-Id: Ic642286098aeeafe379c7f71b6a98da61fb31a21
Sungsoo Lim [Sat, 30 Jul 2016 05:40:52 +0000 (05:40 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours
am:
0fb1075d95
Change-Id: I1a019156b580ec594afbb866bb7aec342de8e636
Sudheer Shanka [Sat, 30 Jul 2016 04:54:27 +0000 (04:54 +0000)]
Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into lmp-mr1-dev
am:
dbbdb6d089
Change-Id: I53e854c96f9bf68855ea949a640c4701e0b2ba5e
Sudheer Shanka [Sat, 30 Jul 2016 04:54:25 +0000 (04:54 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
am:
7ef684713e
Change-Id: I0a9fa6126709e9cf3d3be7653f48503613d10f27
Sungsoo Lim [Sat, 30 Jul 2016 04:44:18 +0000 (04:44 +0000)]
Merge \"DO NOT MERGE: Fix CTS regression\" into lmp-dev
am:
124cc534f8 -s ours
Change-Id: I960e31d55b6c47df345457afbd505c50afeebcfa
Sungsoo Lim [Sat, 30 Jul 2016 04:44:16 +0000 (04:44 +0000)]
DO NOT MERGE: Fix CTS regression
am:
edc9238514 -s ours
Change-Id: If11ad6b402e48aebcce8afc6d5f6093bde539a6e
Sungsoo Lim [Fri, 29 Jul 2016 23:18:51 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Fix CTS regression" into lmp-dev
Sudheer Shanka [Fri, 29 Jul 2016 21:50:32 +0000 (21:50 +0000)]
Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into lmp-mr1-dev
Sungsoo Lim [Fri, 29 Jul 2016 19:03:14 +0000 (19:03 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours am:
6489d870d7 -s ours
am:
2dbb64594a
Change-Id: I04df61df1a926dbfe42d22127bdd4baabe7235d4
Sungsoo Lim [Fri, 29 Jul 2016 18:56:07 +0000 (18:56 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours
am:
6489d870d7 -s ours
Change-Id: I2631c56fbb3d7130b5389ed232c1a2fe0859b053
Sungsoo Lim [Fri, 29 Jul 2016 18:45:45 +0000 (18:45 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171
am:
f645010092 -s ours
Change-Id: Iad2f1d1a445e4891892f03294fed028b71f94368
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 [Fri, 29 Jul 2016 18:38:06 +0000 (18:38 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7
am:
057b548171
Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989
Sungsoo Lim [Fri, 29 Jul 2016 18:31:07 +0000 (18:31 +0000)]
DO NOT MERGE: Fix CTS regression
am:
df17644db7
Change-Id: Id9bed3c68661176a72bcb606e0fc0a026173ac22
Sudheer Shanka [Fri, 29 Jul 2016 17:50:10 +0000 (10:50 -0700)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
Bug:
29189712
Bug:
30317026
Bug:
30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
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
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
David Christie [Tue, 26 Jul 2016 00:13:23 +0000 (17:13 -0700)]
Fix vulnerability where large GPS XTRA data can be injected.
-Can potentially crash system with OOM.
Bug:
29555864
Change-Id: I7157f48dddf148a9bcab029cf12e26a58d8054f4
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 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: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: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 [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
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
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 [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: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