OSDN Git Service
Sudheer Shanka [Thu, 25 Aug 2016 23:14:09 +0000 (23:14 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58 am:
cdf70ba0a3
am:
c2a760e68c
Change-Id: I2e5a3bb037921013e78b4270d843cebe239ac520
Sudheer Shanka [Thu, 25 Aug 2016 23:14:06 +0000 (23:14 +0000)]
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
Amith Yamasani [Thu, 25 Aug 2016 23:14:04 +0000 (23:14 +0000)]
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
Sudheer Shanka [Thu, 25 Aug 2016 23:14:01 +0000 (23:14 +0000)]
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
Amith Yamasani [Thu, 25 Aug 2016 23:13:58 +0000 (23:13 +0000)]
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
Narayan Kamath [Thu, 25 Aug 2016 23:08:25 +0000 (23:08 +0000)]
resolve merge conflicts of
5191225 to mnc-dev
am:
1fbc4b8624
Change-Id: Id3aad329dd515a392cbeb2f0e03c2eb5aee5cf71
Sudheer Shanka [Thu, 25 Aug 2016 23:07:56 +0000 (23:07 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58
am:
cdf70ba0a3
Change-Id: Ia7c597b1b96e65cce89396a6b509a796bb17bc2c
Sudheer Shanka [Thu, 25 Aug 2016 23:07:53 +0000 (23:07 +0000)]
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
Amith Yamasani [Thu, 25 Aug 2016 23:07:51 +0000 (23:07 +0000)]
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
Sudheer Shanka [Thu, 25 Aug 2016 23:07:49 +0000 (23:07 +0000)]
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
Amith Yamasani [Thu, 25 Aug 2016 23:07:46 +0000 (23:07 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0
am:
117a383099 -s ours
Change-Id: I8173ba5c3156a6294d672db63c4a310b0c880cfb
Narayan Kamath [Thu, 25 Aug 2016 09:43:25 +0000 (10:43 +0100)]
resolve merge conflicts of
5191225 to mnc-dev
Change-Id: I8dd276f61e77b0fe2d861f4b0d34d76bf533192f
Narayan Kamath [Wed, 24 Aug 2016 22:23:54 +0000 (22:23 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04
am:
c01db7dca3
Change-Id: I056c33c5925a625b539df250af0fa7d48258b0f2
David Christie [Wed, 24 Aug 2016 22:23:52 +0000 (22:23 +0000)]
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
David Christie [Wed, 24 Aug 2016 22:23:49 +0000 (22:23 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66
am:
d610363a48
Change-Id: I186b4bedcf057489deca1e161a052619ce594e56
David Christie [Wed, 24 Aug 2016 22:23:46 +0000 (22:23 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d
am:
dd1016c619
Change-Id: I54910f6c22b69b029be80007cdbf06b203886398
David Christie [Wed, 24 Aug 2016 22:16:07 +0000 (22:16 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev
am:
6195acc2b5
Change-Id: I34c3133924af9906b88ebd5faf78e0c000aa05be
Narayan Kamath [Wed, 24 Aug 2016 22:14:36 +0000 (22:14 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f
am:
c11e8fcc04
Change-Id: Idd314c1e12919d8cbaf9e71d72519d34d18e6f01
David Christie [Wed, 24 Aug 2016 22:14:32 +0000 (22:14 +0000)]
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
David Christie [Wed, 24 Aug 2016 22:14:28 +0000 (22:14 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1
am:
af369f6e66
Change-Id: I6973f8f1053644548062b94c1696c123f47f0ad4
David Christie [Wed, 24 Aug 2016 22:14:24 +0000 (22:14 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev
am:
975879a18d
Change-Id: Icf81e5ce2bc02750d66b13feedfc098dd9374167
David Christie [Wed, 24 Aug 2016 20:47:57 +0000 (13:47 -0700)]
resolve merge conflicts of
a2399b4 to mnc-dev
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
Sudheer Shanka [Wed, 24 Aug 2016 20:38:40 +0000 (20:38 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944
am:
a0994c6d58
Change-Id: I50cb41c74c4d049390155fc0981f6609673febd0
Sudheer Shanka [Wed, 24 Aug 2016 20:38:30 +0000 (20:38 +0000)]
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
Amith Yamasani [Wed, 24 Aug 2016 20:38:20 +0000 (20:38 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986
am:
03b0f5c3ec
Change-Id: Ic8565bef0bbd034c4d54eff428731809b29ee0c3
Sudheer Shanka [Wed, 24 Aug 2016 20:38:16 +0000 (20:38 +0000)]
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
Amith Yamasani [Wed, 24 Aug 2016 20:38:12 +0000 (20:38 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf
am:
dd0be992c0
Change-Id: I93958d0b8cf2d7a79af4ff534209848f3b0e35c2
Narayan Kamath [Wed, 24 Aug 2016 20:30:21 +0000 (20:30 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47 am:
efab128e67 am:
86437ec433
am:
4d7740907e
Change-Id: If0e46bb3e4fd182a46b714e0e9140deac8fc470e
Narayan Kamath [Wed, 24 Aug 2016 20:30:13 +0000 (20:30 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours am:
2984748753 am:
b9fae65605
am:
c6c7ca0cde
Change-Id: Ifca9f825dac758c653560c41b81a13bd13c9fd4c
Narayan Kamath [Wed, 24 Aug 2016 20:30:09 +0000 (20:30 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f
am:
3c63bb367f
Change-Id: Iaa5ba9f3fcc28da14b60dc489e49bd177d2bfcb3
David Christie [Wed, 24 Aug 2016 20:30:06 +0000 (20:30 +0000)]
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
David Christie [Wed, 24 Aug 2016 20:30:01 +0000 (20:30 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24
am:
41a0dd41f1
Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801
David Christie [Tue, 23 Aug 2016 23:19:51 +0000 (16:19 -0700)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
Sudheer Shanka [Mon, 22 Aug 2016 22:38:23 +0000 (22:38 +0000)]
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
Sudheer Shanka [Mon, 22 Aug 2016 22:33:15 +0000 (22:33 +0000)]
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
Sudheer Shanka [Mon, 22 Aug 2016 22:33:10 +0000 (22:33 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9
am:
6a50270944
Change-Id: I55fa6f6719a4ce3358ca7ba9f0244fb4ada96368
Sudheer Shanka [Mon, 22 Aug 2016 22:28:24 +0000 (22:28 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours
am:
bbbb514bc9
Change-Id: I47bfb18ce300e52a092da534b8aac720f0b8aa3f
Sudheer Shanka [Mon, 22 Aug 2016 22:19:10 +0000 (22:19 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a3af5c6207 am:
21ef672cab
am:
e0d1ff1c42 -s ours
Change-Id: I8a1464443e84bb7987235d25ad40ae01386d72ef
Sudheer Shanka [Mon, 22 Aug 2016 22:19:06 +0000 (22:19 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev
am:
76c4b2a7b6 -s ours
Change-Id: Icdcd0929eb7bd32665e91fe2598af46db3ff01bd
Sudheer Shanka [Mon, 22 Aug 2016 22:11:52 +0000 (22:11 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a3af5c6207
am:
21ef672cab
Change-Id: Ia073a40c330038e77ff5992c056a8fe0a5924edb
TreeHugger Robot [Fri, 19 Aug 2016 20:03:46 +0000 (20:03 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
Sudheer Shanka [Fri, 19 Aug 2016 18:27:31 +0000 (11:27 -0700)]
resolve merge conflicts of
270947f to klp-modular-dev
Change-Id: I703a7f8eb0897e518c3df9e8c7efa19508611a47
Sudheer Shanka [Fri, 19 Aug 2016 18:01:17 +0000 (18:01 +0000)]
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
Sudheer Shanka [Fri, 19 Aug 2016 17:46:12 +0000 (17:46 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev
am:
de04301f9a
Change-Id: I1d04889e2227d0a9a6b86b44ce38cdc5763dfac0
Sudheer Shanka [Fri, 19 Aug 2016 17:32:01 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
a3af5c6207
Change-Id: Ibdd69f2fa346dc31224fa6357718f56aa26ded1d
Amith Yamasani [Fri, 19 Aug 2016 17:31:47 +0000 (17:31 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours
am:
9be12f8986
Change-Id: Ie692388b7c4ad6492444347ac128d8cf83dd9e21
Sudheer Shanka [Fri, 19 Aug 2016 17:31:43 +0000 (17:31 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev
am:
5e55214ab7
Change-Id: If6174229b0b6d378b7cf6c5f5618ce70d04c400b
Amith Yamasani [Fri, 19 Aug 2016 17:31:39 +0000 (17:31 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
b02862c2cf
Change-Id: Id89010f4bf96a43ef9f97488353fbdf89c6f2931
Sudheer Shanka [Fri, 19 Aug 2016 17:22:29 +0000 (17:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am:
b51e98becb
Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
Amith Yamasani [Fri, 19 Aug 2016 17:22:25 +0000 (17:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
d1eeb5b7b4
Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
Sudheer Shanka [Fri, 19 Aug 2016 17:11:30 +0000 (17:11 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev
am:
96052ea905 -s ours
Change-Id: I6d7353ed5154dfa3c6d556e4701c8c8e4f66feac
Amith Yamasani [Fri, 19 Aug 2016 17:11:28 +0000 (17:11 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
a92810a189 -s ours
Change-Id: Ic25323f818ee224640686c4e1d6c3b3f62ff828f
Sudheer Shanka [Fri, 19 Aug 2016 17:07:04 +0000 (17:07 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:58 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:56 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:53 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
Jim Miller [Fri, 19 Aug 2016 03:22:33 +0000 (20:22 -0700)]
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
Narayan Kamath [Thu, 18 Aug 2016 10:30:00 +0000 (10:30 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47 am:
efab128e67
am:
86437ec433
Change-Id: If18135c4aebd55fa9a1f08e275dbfef3dc433b5e
Narayan Kamath [Thu, 18 Aug 2016 10:29:55 +0000 (10:29 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours am:
2984748753
am:
b9fae65605
Change-Id: I3df204c005d61091f83e6ee2bd6bcd2a63a68c2b
Narayan Kamath [Thu, 18 Aug 2016 10:23:23 +0000 (10:23 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47
am:
efab128e67
Change-Id: I7159b2996f35311a630cdb7b2646c0e94d159c1f
Narayan Kamath [Thu, 18 Aug 2016 10:23:20 +0000 (10:23 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours
am:
2984748753
Change-Id: Id9f73afcbc747e3e341c5cfa665e4929747fdbac
Narayan Kamath [Thu, 18 Aug 2016 10:19:28 +0000 (10:19 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87
am:
4cf5241f47
Change-Id: Ibd736c16c8af9397e774c5abb917a9a3d31681a0
Narayan Kamath [Thu, 18 Aug 2016 10:16:48 +0000 (10:16 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108
am:
b56f4f53e1 -s ours
Change-Id: I67e1ff67c88d8c70a9d6d0698c857be77f09f534
Narayan Kamath [Thu, 18 Aug 2016 09:58:45 +0000 (09:58 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0
am:
1bd43c162f
Change-Id: Ic38c43db48584b3d899e120fd65a4058d806a39f
Narayan Kamath [Thu, 18 Aug 2016 09:56:29 +0000 (09:56 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2
am:
8fdee85e87
Change-Id: I654191bebb88a8005e9f46ad8b8b1f932214b3c9
Narayan Kamath [Thu, 18 Aug 2016 09:56:24 +0000 (09:56 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284
am:
b85e9e9108
Change-Id: Ie4874c088e05f4f5bc2073661010d413e60b3f7b
Narayan Kamath [Thu, 18 Aug 2016 09:53:12 +0000 (09:53 +0000)]
Process: Fix communication with zygote.
am:
e29c6493c0
Change-Id: I86b073f7f69943911aa0bea782e29ae6d86609a2
Narayan Kamath [Thu, 18 Aug 2016 09:50:56 +0000 (09:50 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev
am:
6829cf28e2
Change-Id: I740364ba90a8d1f14a5b2d2aacfe44948a4583d2
Narayan Kamath [Thu, 18 Aug 2016 09:50:52 +0000 (09:50 +0000)]
Process: Fix communication with zygote.
am:
8e69dd2284
Change-Id: I3860d3f66e256a6446df5d8ce20f752d1c002e0f
Narayan Kamath [Thu, 18 Aug 2016 09:46:17 +0000 (09:46 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev
Jim Miller [Wed, 17 Aug 2016 22:59:27 +0000 (22:59 +0000)]
Fix vulnerability in LockSettings service
am:
2d71384a13
Change-Id: I62ca5fb150022fe0971329294b1063957f397248
Narayan Kamath [Tue, 9 Aug 2016 16:00:25 +0000 (17:00 +0100)]
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
Narayan Kamath [Tue, 9 Aug 2016 16:00:25 +0000 (17:00 +0100)]
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
Jim Miller [Wed, 10 Aug 2016 22:43:17 +0000 (15:43 -0700)]
Fix vulnerability in LockSettings service
Fixes bug
30003944
Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
Sudheer Shanka [Sat, 13 Aug 2016 01:49:56 +0000 (18:49 -0700)]
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
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
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
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
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
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
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
David Christie [Fri, 12 Aug 2016 20:17:03 +0000 (20:17 +0000)]
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
David Christie [Fri, 12 Aug 2016 20:17:00 +0000 (20:17 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2
am:
b7f8b59e24
Change-Id: I26eda3647447490d58777d9fd8b2055ab8574e5e
David Christie [Fri, 12 Aug 2016 20:09:56 +0000 (20:09 +0000)]
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
David Christie [Fri, 12 Aug 2016 20:09:54 +0000 (20:09 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev
am:
288166cbb2
Change-Id: Ie8927cbe2b224241f8d896487ff17117c15c0255
David Christie [Fri, 12 Aug 2016 19:56:57 +0000 (19:56 +0000)]
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
David Christie [Thu, 11 Aug 2016 20:06:08 +0000 (13:06 -0700)]
resolve merge conflicts of
b4a5615 to lmp-dev
Change-Id: I1b9ebc398226ead9d7f494c4ac56a7b1d9d6586f
David Christie [Thu, 11 Aug 2016 18:33:18 +0000 (18:33 +0000)]
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
David Christie [Thu, 11 Aug 2016 18:33:15 +0000 (18:33 +0000)]
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
David Christie [Thu, 11 Aug 2016 18:27:26 +0000 (18:27 +0000)]
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
David Christie [Thu, 11 Aug 2016 18:27:22 +0000 (18:27 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864
am:
dde12c6923
Change-Id: I772d5b997df579d3611eafc7542aeee2d690f946
David Christie [Thu, 11 Aug 2016 18:15:29 +0000 (18:15 +0000)]
Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864" into klp-dev
Chris Tate [Wed, 10 Aug 2016 17:15:26 +0000 (17:15 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
Christopher Tate [Fri, 29 Jul 2016 23:01:31 +0000 (16:01 -0700)]
DO NOT MERGE: Backport N backup/restore stability work to M
This is a squashed rollup of backup/restore infrastructural work in
the N release. It intentionally omits semantic/API changes such
as the introduction of the onQuotaExceeded() callback.
This patchset should not be merged beyond M maintenance releases.
Bug
29617908
Bug
29848715
Change-Id: I1eb25ad07f3bbf1132198d8a233722c41f1ac4cc
Sungsoo Lim [Sat, 30 Jul 2016 07:14:33 +0000 (07:14 +0000)]
Merge \\\\\"DO NOT MERGE: Fix CTS regression\\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648 am:
ec986ac944 -s ours
am:
cc154342aa
Change-Id: Ic1bc071d11c42771d46ad1b2da9e9264299d5e7b
Sungsoo Lim [Sat, 30 Jul 2016 06:55:41 +0000 (06:55 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c am:
1fcc472b3e -s ours
am:
1559998d08
Change-Id: Iececea055821da36f2aa7870e1c2fc04ac58e22c
Sungsoo Lim [Sat, 30 Jul 2016 06:41:37 +0000 (06:41 +0000)]
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
Sungsoo Lim [Sat, 30 Jul 2016 06:41:33 +0000 (06:41 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c
am:
1fcc472b3e -s ours
Change-Id: Icf6055101947c23621ed320469c475dd105dd60f
Sudheer Shanka [Sat, 30 Jul 2016 06:21:06 +0000 (06:21 +0000)]
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
am:
98ae56902e
Change-Id: I5fb6decba8be97f68a0b24d6caa5d718929ea4d3
Sudheer Shanka [Sat, 30 Jul 2016 06:21:04 +0000 (06:21 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7ef684713e am:
9f6bd40108 am:
f01ee1c291 -s ours
am:
373492b076
Change-Id: Ibfc86e4b13fcc88c09b7ac74a7b0ddc4bd42dda7
Sungsoo Lim [Sat, 30 Jul 2016 05:57:16 +0000 (05:57 +0000)]
Merge \\\"DO NOT MERGE: Fix CTS regression\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9
am:
8ef8e2b648
Change-Id: I245e257deb8febb49f2abd7322eb3a24db564b31
Sungsoo Lim [Sat, 30 Jul 2016 05:57:09 +0000 (05:57 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95
am:
f928b8062c
Change-Id: I92c4e992dc23f43851a9fab8479db408a89f5e89
Sungsoo Lim [Sat, 30 Jul 2016 05:40:55 +0000 (05:40 +0000)]
Merge \\"DO NOT MERGE: Fix CTS regression\\" into lmp-dev am:
124cc534f8 -s ours
am:
3d58e326d9
Change-Id: Ic642286098aeeafe379c7f71b6a98da61fb31a21