202802 Commits

Author SHA1 Message Date
Sudheer Shanka
97194798ab Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours
am: 603a69ffb4

Change-Id: Ie94c3c24a3b07c26c8b363358f4df1d7366d95a2
2016-08-25 23:14:06 +00:00
Amith Yamasani
75c7391a41 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours
am: 9080d4462e

Change-Id: Idd437ad418ac2deaf08a9c0ac89cb518c216d8f1
2016-08-25 23:14:04 +00:00
Sudheer Shanka
2490679d7e Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours
am: 86ac88ccdb

Change-Id: Ia473e706d7b50376fffb122e03e48bd947f47562
2016-08-25 23:14:01 +00:00
Amith Yamasani
1d513c845a DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours
am: 368ae62e9d

Change-Id: Icfafc6e9d56a97777db1c3d0e0feae3305f6707f
2016-08-25 23:13:58 +00:00
Narayan Kamath
a21569cd76 resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
am: 8f4f9e4d5e

Change-Id: I2f470a15113ac14219dea82c3a9487ef96f3f2f4
2016-08-25 23:13:51 +00:00
Narayan Kamath
8f4f9e4d5e resolve merge conflicts of 5191225 to mnc-dev
am: 1fbc4b8624

Change-Id: Id3aad329dd515a392cbeb2f0e03c2eb5aee5cf71
2016-08-25 23:08:25 +00:00
Sudheer Shanka
c2a760e68c resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58
am: cdf70ba0a3

Change-Id: Ia7c597b1b96e65cce89396a6b509a796bb17bc2c
2016-08-25 23:07:56 +00:00
Sudheer Shanka
603a69ffb4 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288
am: dfc2d0a4bc  -s ours

Change-Id: Ia4a5952bc4fda5be8602708215ff1d72a5db297a
2016-08-25 23:07:53 +00:00
Amith Yamasani
9080d4462e DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec
am: 7b8140652b  -s ours

Change-Id: I40d855d0f87483a6a8733475b490ddf6ee582433
2016-08-25 23:07:51 +00:00
Sudheer Shanka
86ac88ccdb Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6
am: 26bb7bf86c  -s ours

Change-Id: Id2ddb640c8d041f13a78c5f07fb1749968618b61
2016-08-25 23:07:49 +00:00
Amith Yamasani
368ae62e9d DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0
am: 117a383099  -s ours

Change-Id: I8173ba5c3156a6294d672db63c4a310b0c880cfb
2016-08-25 23:07:46 +00:00
Narayan Kamath
1fbc4b8624 resolve merge conflicts of 5191225 to mnc-dev
Change-Id: I8dd276f61e77b0fe2d861f4b0d34d76bf533192f
2016-08-25 10:43:25 +01:00
Narayan Kamath
dd496ec8b0 Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3
am: 8e168116d0

Change-Id: Iffa2e8ae4f02adaf4c031d8b5d50362ee9efb1d1
2016-08-24 22:33:43 +00:00
David Christie
551e6c786f 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 am: 3970ee98f7
am: 735699f3ef

Change-Id: I80e68cde7a673cfb269ecad9114dbb14850287b4
2016-08-24 22:33:41 +00:00
David Christie
187d841b75 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48
am: 0777ad8253

Change-Id: I9403ca33c0b87ca1ca01f2ce5209c12332b01e51
2016-08-24 22:33:39 +00:00
David Christie
a6de8f20c7 resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619
am: 3aaac55e70

Change-Id: I01b09466d9993f28de5c95a7d21555b3be112891
2016-08-24 22:33:37 +00:00
Narayan Kamath
8e168116d0 Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04
am: c01db7dca3

Change-Id: I056c33c5925a625b539df250af0fa7d48258b0f2
2016-08-24 22:23:54 +00:00
David Christie
735699f3ef 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
am: 3970ee98f7

Change-Id: I68f89fabe5603941e009f48f3277a2c40221ce74
2016-08-24 22:23:52 +00:00
David Christie
0777ad8253 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66
am: d610363a48

Change-Id: I186b4bedcf057489deca1e161a052619ce594e56
2016-08-24 22:23:49 +00:00
David Christie
3aaac55e70 resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d
am: dd1016c619

Change-Id: I54910f6c22b69b029be80007cdbf06b203886398
2016-08-24 22:23:46 +00:00
David Christie
362668b6f7 resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5
am: e24eb2dbb5

Change-Id: Idb6cbe8c16877301aed50faed41fa0390db3cf10
2016-08-24 22:23:42 +00:00
David Christie
e24eb2dbb5 resolve merge conflicts of a2399b4 to mnc-dev
am: 6195acc2b5

Change-Id: I34c3133924af9906b88ebd5faf78e0c000aa05be
2016-08-24 22:16:07 +00:00
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
Sudheer Shanka
cdf70ba0a3 resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944
am: a0994c6d58

Change-Id: I50cb41c74c4d049390155fc0981f6609673febd0
2016-08-24 20:38:40 +00:00
Sudheer Shanka
dfc2d0a4bc Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06
am: f21534a288

Change-Id: I4e5a6b4eb30dde276a1293e986398a8dba21ef05
2016-08-24 20:38:30 +00:00
Amith Yamasani
7b8140652b DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986
am: 03b0f5c3ec

Change-Id: Ic8565bef0bbd034c4d54eff428731809b29ee0c3
2016-08-24 20:38:20 +00:00
Sudheer Shanka
26bb7bf86c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7
am: c8aedeeaf6

Change-Id: Id8f62a0c41004aa713d61a87f59e7ee1eff4ee0a
2016-08-24 20:38:16 +00:00
Amith Yamasani
117a383099 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf
am: dd0be992c0

Change-Id: I93958d0b8cf2d7a79af4ff534209848f3b0e35c2
2016-08-24 20:38:12 +00:00
Narayan Kamath
5191225400 Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67 am: 86437ec433
am: 4d7740907e

Change-Id: If0e46bb3e4fd182a46b714e0e9140deac8fc470e
2016-08-24 20:30:21 +00: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
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
Julius D'souza
3275a3a5a5 DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
Bug: 18572096

Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
2016-08-22 11:40:03 -07:00
Jim Miller
ddf70b9195 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
am: 02e9affa42

Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
2016-08-19 20:09:43 +00:00
Jim Miller
9f04985991 Bind fingerprint when we start authentication - DO NOT MERGE
am: b6f4b48df2

Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
2016-08-19 20:09:41 +00:00
TreeHugger Robot
02e9affa42 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev 2016-08-19 20:03:48 +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