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

164672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
a0994c6d58 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab am: e0d1ff1c42 -s ours am: b31a6955a4 -s ours 
am: 52d0f48f80

Change-Id: I01d36d2e160c3e33e3f2701843d768b5f581af1b
 2016-08-22 22:38:23 +00:00
Sudheer Shanka
52d0f48f80 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab am: e0d1ff1c42 -s ours 
am: b31a6955a4  -s ours

Change-Id: I6fb134e75355bc1fdcc2dd9a21b51802575c28f3
 2016-08-22 22:33:15 +00:00
Sudheer Shanka
f21534a288 resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 
am: 6a50270944

Change-Id: I55fa6f6719a4ce3358ca7ba9f0244fb4ada96368
 2016-08-22 22:33:10 +00:00
Sudheer Shanka
6a50270944 resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours 
am: bbbb514bc9

Change-Id: I47bfb18ce300e52a092da534b8aac720f0b8aa3f
 2016-08-22 22:28:24 +00:00
Sudheer Shanka
b31a6955a4 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab 
am: e0d1ff1c42  -s ours

Change-Id: I8a1464443e84bb7987235d25ad40ae01386d72ef
 2016-08-22 22:19:10 +00:00
Sudheer Shanka
bbbb514bc9 resolve merge conflicts of 270947f to klp-modular-dev 
am: 76c4b2a7b6  -s ours

Change-Id: Icdcd0929eb7bd32665e91fe2598af46db3ff01bd
 2016-08-22 22:19:06 +00:00
Sudheer Shanka
e0d1ff1c42 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 
am: 21ef672cab

Change-Id: Ia073a40c330038e77ff5992c056a8fe0a5924edb
 2016-08-22 22:11:52 +00:00
Sudheer Shanka
76c4b2a7b6 resolve merge conflicts of 270947f to klp-modular-dev 
Change-Id: I703a7f8eb0897e518c3df9e8c7efa19508611a47
 2016-08-19 11:37:22 -07:00
Sudheer Shanka
03b0f5c3ec 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
 2016-08-19 18:01:17 +00:00
Sudheer Shanka
21ef672cab Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev 
am: de04301f9a

Change-Id: I1d04889e2227d0a9a6b86b44ce38cdc5763dfac0
 2016-08-19 17:46:12 +00:00
Sudheer Shanka
270947f78c DO NOT MERGE: Clean up when recycling a pid with a pending launch 
am: a3af5c6207

Change-Id: Ibdd69f2fa346dc31224fa6357718f56aa26ded1d
 2016-08-19 17:32:01 +00:00
Amith Yamasani
c8aedeeaf6 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours 
am: 9be12f8986

Change-Id: Ie692388b7c4ad6492444347ac128d8cf83dd9e21
 2016-08-19 17:31:47 +00:00
Sudheer Shanka
dd0be992c0 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev 
am: 5e55214ab7

Change-Id: If6174229b0b6d378b7cf6c5f5618ce70d04c400b
 2016-08-19 17:31:43 +00:00
Amith Yamasani
4d7740907e DO NOT MERGE: Clean up when recycling a pid with a pending launch 
am: b02862c2cf

Change-Id: Id89010f4bf96a43ef9f97488353fbdf89c6f2931
 2016-08-19 17:31:39 +00:00
Sudheer Shanka
f368bdee06 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev 
am: 96052ea905  -s ours

Change-Id: I6d7353ed5154dfa3c6d556e4701c8c8e4f66feac
 2016-08-19 17:11:30 +00:00
Amith Yamasani
9be12f8986 DO NOT MERGE: Clean up when recycling a pid with a pending launch 
am: a92810a189  -s ours

Change-Id: Ic25323f818ee224640686c4e1d6c3b3f62ff828f
 2016-08-19 17:11:28 +00:00
Sudheer Shanka
de04301f9a Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev 2016-08-19 17:07:06 +00:00
Sudheer Shanka
5e55214ab7 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev 2016-08-19 17:07:01 +00:00
Sudheer Shanka
96052ea905 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev 2016-08-19 17:06:58 +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 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
Sudheer Shanka
a3af5c6207 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: I84b74edc29ca3fb88048b44af682ecbeb176b774
 2016-08-12 18:49:56 -07:00
Amith Yamasani
b02862c2cf 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:32:42 -07:00
Amith Yamasani
a92810a189 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:28:45 -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
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