Narayan Kamath
a21569cd76
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
...
am: 8f4f9e4d5e
2016-08-25 23:13:51 +00:00
Narayan Kamath
8f4f9e4d5e
resolve merge conflicts of 5191225 to mnc-dev
...
am: 1fbc4b8624
2016-08-25 23:08:25 +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
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
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
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
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
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
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
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
2016-08-24 22:23:46 +00:00
David Christie
362668b6f7
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5
...
am: e24eb2dbb5
2016-08-24 22:23:42 +00:00
David Christie
e24eb2dbb5
resolve merge conflicts of a2399b4 to mnc-dev
...
am: 6195acc2b5
2016-08-24 22:16:07 +00:00
Narayan Kamath
c01db7dca3
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f
...
am: c11e8fcc04
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
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
2016-08-24 22:14:28 +00:00
David Christie
dd1016c619
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
...
am: 975879a18d
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
5191225400
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67 am: 86437ec433
...
am: 4d7740907e
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
2016-08-24 20:30:13 +00:00
Narayan Kamath
c6ab92e93b
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f
...
am: 3c63bb367f
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
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
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
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
2016-08-19 20:09:43 +00:00
Jim Miller
9f04985991
Bind fingerprint when we start authentication - DO NOT MERGE
...
am: b6f4b48df2
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
08eb52f9f9
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb
...
am: 7e890c8eb5
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
2016-08-19 17:32:44 +00:00
Amith Yamasani
4d7740907e
DO NOT MERGE: Clean up when recycling a pid with a pending launch
...
am: b02862c2cf
2016-08-19 17:31:39 +00:00
Sudheer Shanka
7e890c8eb5
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
...
am: b51e98becb
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
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
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
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
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
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
2016-08-18 10:19:28 +00:00
Narayan Kamath
2984748753
Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108
...
am: b56f4f53e1
2016-08-18 10:16:48 +00:00
Narayan Kamath
8788a2413c
Process: Fix communication with zygote. am: e29c6493c0
...
am: 1bd43c162f
2016-08-18 09:58:45 +00:00
Narayan Kamath
4cf5241f47
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2
...
am: 8fdee85e87
2016-08-18 09:56:29 +00:00
Narayan Kamath
b56f4f53e1
Process: Fix communication with zygote. am: 8e69dd2284
...
am: b85e9e9108
2016-08-18 09:56:24 +00:00
Narayan Kamath
1bd43c162f
Process: Fix communication with zygote.
...
am: e29c6493c0
2016-08-18 09:53:12 +00:00
Narayan Kamath
8fdee85e87
Merge "Process: Fix communication with zygote." into klp-dev
...
am: 6829cf28e2
2016-08-18 09:50:56 +00:00
Narayan Kamath
b85e9e9108
Process: Fix communication with zygote.
...
am: 8e69dd2284
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
Jim Miller
229de7088e
Fix vulnerability in LockSettings service am: 2d71384a13
...
am: 485fbda04c
2016-08-17 23:07:46 +00:00
Jim Miller
485fbda04c
Fix vulnerability in LockSettings service
...
am: 2d71384a13
2016-08-17 22:59:27 +00:00
