Commit Graph

199065 Commits

Author SHA1 Message Date
Narayan Kamath
c01db7dca3 Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f
am: c11e8fcc04

Change-Id: Idd314c1e12919d8cbaf9e71d72519d34d18e6f01
2016-08-24 22:14:36 +00:00
David Christie
3970ee98f7 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 am: 8788a2413c
am: c6ab92e93b

Change-Id: I0d17aacc1d83b2bceb9abcfa3da1f1ff3dc74e09
2016-08-24 22:14:32 +00:00
David Christie
d610363a48 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1
am: af369f6e66

Change-Id: I6973f8f1053644548062b94c1696c123f47f0ad4
2016-08-24 22:14:28 +00:00
David Christie
dd1016c619 resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
am: 975879a18d

Change-Id: Icf81e5ce2bc02750d66b13feedfc098dd9374167
2016-08-24 22:14:24 +00:00
David Christie
6195acc2b5 resolve merge conflicts of a2399b4 to mnc-dev
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
2016-08-24 13:47:57 -07:00
Narayan Kamath
c11e8fcc04 Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours am: 2984748753 am: b9fae65605
am: c6c7ca0cde

Change-Id: Ifca9f825dac758c653560c41b81a13bd13c9fd4c
2016-08-24 20:30:13 +00:00
Narayan Kamath
c6ab92e93b Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f
am: 3c63bb367f

Change-Id: Iaa5ba9f3fcc28da14b60dc489e49bd177d2bfcb3
2016-08-24 20:30:09 +00:00
David Christie
af369f6e66 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
am: 8788a2413c

Change-Id: If9d5385d7d949e85932e5586d4884ffe84d51d47
2016-08-24 20:30:06 +00:00
David Christie
975879a18d resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
am: 41a0dd41f1

Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801
2016-08-24 20:30:01 +00:00
David Christie
a2399b45e2 resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
2016-08-23 16:19:51 -07:00
Sudheer Shanka
b51e98becb Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev 2016-08-19 17:06:55 +00:00
Narayan Kamath
c6c7ca0cde Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67
am: 86437ec433

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

Change-Id: I3df204c005d61091f83e6ee2bd6bcd2a63a68c2b
2016-08-18 10:29:55 +00:00
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
8788a2413c Process: Fix communication with zygote. am: e29c6493c0
am: 1bd43c162f

Change-Id: Ic38c43db48584b3d899e120fd65a4058d806a39f
2016-08-18 09:58:45 +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 448be0a622)

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 448be0a622)

Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
2016-08-16 16:17:29 +00:00
Jim Miller
2d71384a13 Fix vulnerability in LockSettings service
Fixes bug 30003944

Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
2016-08-16 00:09:33 +00:00
Amith Yamasani
d1eeb5b7b4 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
2016-08-12 18:16:38 -07:00
David Christie
41a0dd41f1 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
2016-08-12 20:17:03 +00:00
David Christie
1081a15fd4 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2
am: b7f8b59e24

Change-Id: I26eda3647447490d58777d9fd8b2055ab8574e5e
2016-08-12 20:17:00 +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
cc154342aa Merge \\\\"DO NOT MERGE: Fix CTS regression\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648
am: ec986ac944  -s ours

Change-Id: I66ddeab0f0f2fa3d3f3fff71a20cd0b842c2f9d6
2016-07-30 06:41:37 +00:00
Sungsoo Lim
1559998d08 DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c
am: 1fcc472b3e  -s ours

Change-Id: Icf6055101947c23621ed320469c475dd105dd60f
2016-07-30 06:41:33 +00:00
Sungsoo Lim
ec986ac944 Merge \\\"DO NOT MERGE: Fix CTS regression\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9
am: 8ef8e2b648

Change-Id: I245e257deb8febb49f2abd7322eb3a24db564b31
2016-07-30 05:57:16 +00:00
Sungsoo Lim
1fcc472b3e DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95
am: f928b8062c

Change-Id: I92c4e992dc23f43851a9fab8479db408a89f5e89
2016-07-30 05:57:09 +00:00
Sungsoo Lim
8ef8e2b648 Merge \\"DO NOT MERGE: Fix CTS regression\\" into lmp-dev am: 124cc534f8 -s ours
am: 3d58e326d9

Change-Id: Ic642286098aeeafe379c7f71b6a98da61fb31a21
2016-07-30 05:40:55 +00:00
Sungsoo Lim
f928b8062c DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours
am: 0fb1075d95

Change-Id: I1a019156b580ec594afbb866bb7aec342de8e636
2016-07-30 05:40:52 +00:00
Sudheer Shanka
98ae56902e Merge \\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff
am: 28acd0fae9  -s ours

Change-Id: Ifc5732a29b101a9b85a4fd14ff6d0a59d778217c
2016-07-30 05:19:02 +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
28acd0fae9 Merge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\" into lmp-mr1-dev am: dbbdb6d089
am: 9ed6bd83ff

Change-Id: I4f3bac4ecfc819dcca55a5bc725060b63c1b80ea
2016-07-30 05:08:39 +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
9ed6bd83ff Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into lmp-mr1-dev
am: dbbdb6d089

Change-Id: I53e854c96f9bf68855ea949a640c4701e0b2ba5e
2016-07-30 04:54:27 +00:00