Commit Graph

207068 Commits

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

Change-Id: Ibd47e114558f0fc8ce64cd006a79e6ead7445f1d
2016-08-24 22:43:15 +00:00
David Christie
80b8f38224 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
am: 551e6c786f

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

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

Change-Id: I119a274dd1050c6d26b70c7fbfb5ea95662e2a83
2016-08-24 22:39:52 +00: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
David Christie
8aaffd9ebf resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5 am: e24eb2dbb5
am: 362668b6f7

Change-Id: I019f76b45de78171ef888d2175dc9140be172784
2016-08-24 22:30:20 +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
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
Julius D'souza
d5bf4039a9 DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
am: 3275a3a5a5  -s ours

Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5
2016-08-23 16:45:41 +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
364a51221a Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42
am: ddf70b9195

Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
2016-08-19 20:16:37 +00:00
Jim Miller
85c390e9fb Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2
am: 9f04985991

Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
2016-08-19 20:16:34 +00: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
58def3804c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5
am: 08eb52f9f9

Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
2016-08-19 17:54:21 +00:00
Amith Yamasani
5841c492a7 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27
am: 39c7879365

Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
2016-08-19 17:54:19 +00:00
Sudheer Shanka
08eb52f9f9 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb
am: 7e890c8eb5

Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
2016-08-19 17:32:47 +00:00
Amith Yamasani
39c7879365 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4
am: 29ae7b1a27

Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
2016-08-19 17:32:44 +00:00
Sudheer Shanka
7e890c8eb5 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am: b51e98becb

Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
2016-08-19 17:22:29 +00:00
Amith Yamasani
29ae7b1a27 DO NOT MERGE: Clean up when recycling a pid with a pending launch
am: d1eeb5b7b4

Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
2016-08-19 17:22:25 +00: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
Jim Miller
b6f4b48df2 Bind fingerprint when we start authentication - DO NOT MERGE
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.

Fixes bug 30744668

Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
2016-08-19 03:46:40 +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