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

161107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
86437ec433 Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 
am: efab128e67

Change-Id: I7159b2996f35311a630cdb7b2646c0e94d159c1f
 2016-08-18 10:23:23 +00:00
Narayan Kamath
b9fae65605 Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours 
am: 2984748753

Change-Id: Id9f73afcbc747e3e341c5cfa665e4929747fdbac
 2016-08-18 10:23:20 +00:00
Narayan Kamath
efab128e67 Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 
am: 4cf5241f47

Change-Id: Ibd736c16c8af9397e774c5abb917a9a3d31681a0
 2016-08-18 10:19:28 +00:00
Narayan Kamath
2984748753 Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 
am: b56f4f53e1  -s ours

Change-Id: I67e1ff67c88d8c70a9d6d0698c857be77f09f534
 2016-08-18 10:16:48 +00:00
Narayan Kamath
4cf5241f47 Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 
am: 8fdee85e87

Change-Id: I654191bebb88a8005e9f46ad8b8b1f932214b3c9
 2016-08-18 09:56:29 +00:00
Narayan Kamath
b56f4f53e1 Process: Fix communication with zygote. am: 8e69dd2284 
am: b85e9e9108

Change-Id: Ie4874c088e05f4f5bc2073661010d413e60b3f7b
 2016-08-18 09:56:24 +00:00
Narayan Kamath
1bd43c162f Process: Fix communication with zygote. 
am: e29c6493c0

Change-Id: I86b073f7f69943911aa0bea782e29ae6d86609a2
 2016-08-18 09:53:12 +00:00
Narayan Kamath
8fdee85e87 Merge "Process: Fix communication with zygote." into klp-dev 
am: 6829cf28e2

Change-Id: I740364ba90a8d1f14a5b2d2aacfe44948a4583d2
 2016-08-18 09:50:56 +00:00
Narayan Kamath
b85e9e9108 Process: Fix communication with zygote. 
am: 8e69dd2284

Change-Id: I3860d3f66e256a6446df5d8ce20f752d1c002e0f
 2016-08-18 09:50:52 +00:00
Narayan Kamath
6829cf28e2 Merge "Process: Fix communication with zygote." into klp-dev 2016-08-18 09:46:18 +00:00
Narayan Kamath
8e69dd2284 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
 2016-08-16 17:21:49 +01:00
Narayan Kamath
e29c6493c0 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
 2016-08-16 16:17:29 +00:00
David Christie
62783bde30 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
 2016-08-12 20:09:56 +00:00
David Christie
b7f8b59e24 resolve merge conflicts of b4a5615 to lmp-dev 
am: 288166cbb2

Change-Id: Ie8927cbe2b224241f8d896487ff17117c15c0255
 2016-08-12 20:09:54 +00:00
David Christie
655361b2b1 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
 2016-08-12 19:56:57 +00:00
David Christie
288166cbb2 resolve merge conflicts of b4a5615 to lmp-dev 
Change-Id: I1b9ebc398226ead9d7f494c4ac56a7b1d9d6586f
 2016-08-11 13:06:08 -07:00
David Christie
5a6b11114a 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
 2016-08-11 18:33:18 +00:00
David Christie
b4a5615416 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
 2016-08-11 18:33:15 +00:00
David Christie
b9fe170c6a 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
 2016-08-11 18:27:26 +00:00
David Christie
3462e52676 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 
am: dde12c6923

Change-Id: I772d5b997df579d3611eafc7542aeee2d690f946
 2016-08-11 18:27:22 +00:00
David Christie
df7bd91dfa Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev 2016-08-11 18:15:30 +00:00
Sungsoo Lim
3d58e326d9 Merge \"DO NOT MERGE: Fix CTS regression\" into lmp-dev 
am: 124cc534f8  -s ours

Change-Id: I960e31d55b6c47df345457afbd505c50afeebcfa
 2016-07-30 04:44:18 +00:00
Sungsoo Lim
0fb1075d95 DO NOT MERGE: Fix CTS regression 
am: edc9238514  -s ours

Change-Id: If11ad6b402e48aebcce8afc6d5f6093bde539a6e
 2016-07-30 04:44:16 +00:00
Sungsoo Lim
124cc534f8 Merge "DO NOT MERGE: Fix CTS regression" into lmp-dev 2016-07-29 23:18:52 +00:00
Sudheer Shanka
dbbdb6d089 Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into lmp-mr1-dev 2016-07-29 21:50:33 +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
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
f645010092 DO NOT MERGE: Fix CTS regression am: df17644db7 
am: 057b548171

Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989
 2016-07-29 18:38:06 +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
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
7a92dc9d99 DO NOT MERGE: Fix CTS regression 
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
 2016-07-29 01:01:49 +00:00
Sungsoo Lim
edc9238514 DO NOT MERGE: Fix CTS regression 
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
 2016-07-29 01:00:22 +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
David Christie
dde12c6923 Fix vulnerability where large GPS XTRA data can be injected. 
-Can potentially crash system with OOM.
Bug: 29555864

Change-Id: I7157f48dddf148a9bcab029cf12e26a58d8054f4
 2016-07-25 17:13:23 -07: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
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
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
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