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

246346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dirk Dougherty
b5760c1fe7 Fetch ga script over https to avoid mixed content. 
Change-Id: Ic8f3421c67464b941312d6854267adfdf499aa43
 2016-08-25 14:50:54 -07:00
TreeHugger Robot
184edd6d93 Merge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc-dev 2016-08-25 21:38:45 +00:00
Mark Lu
30cba33a60 Merge "docs: rewrite one attribute description in R.attr" into nyc-dev 2016-08-25 21:34:04 +00:00
Mark Lu
d428a012ba Merge "docs: fix broken links in Activity reference" into nyc-dev 2016-08-25 21:33:31 +00:00
Mark Lu
209fb02f84 Merge "docs: fix code snippets in SQL Databases page" into nyc-dev 2016-08-25 21:33:26 +00:00
Hemal Patel
a544221abd Docs: Fixed the Bluetooth guide link 
am: 65813dff14

Change-Id: I4502828940c4f2e33363e10728e97f484bc15651
 2016-08-25 21:31:56 +00:00
Dianne Hackborn
dd28b7b5f3 Try to mitigate issue #31016187: system_server crash in ArraySet. 
Instead of crashing, log a wtf and recover.  This is not a problem
in ArraySet, but caused by someone else using an ArraySet without
protecting access to it.  So whoever is calling at this point is
not the cause, and it isn't worthwhile to let them crash.

Change-Id: Iaefa4315b620c9fe24b31507e4aa47a8525c8540
(cherry picked from commit 92aa4b2ba3c93cc344c885b50b75726599e6065d)
 2016-08-25 19:49:41 +00:00
Mark Goldstein
1c22ae296b docs: Fix typo 
Bug: 25777114
Change-Id: I5c34ceba8f3b76bd47e1c020956cef285bad59d7
 2016-08-25 12:48:07 -07:00
Andrew Solovay
2d629c3e5b docs: Removing non-English /preview/ directories 
The remaining docs in the [language]/preview directories were
causing devsite publish to fail (they refer to files that no longer
exist). Removing all those directories; redirects are already set up.

See first comment for doc stage location.

Change-Id: Ic22652d44696ec2647586e19aa61627d40232239
 2016-08-25 12:36:36 -07: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
77a9ef952c Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 am: dd496ec8b0 
am: 472a7792f3

Change-Id: I065968bf2bd6166eae33c7eec347e371a5edf447
 2016-08-25 01:25:55 +00:00
David Christie
9c4d02fb3f 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 
am: 80b8f38224

Change-Id: I43da972f73a86a305d2b20db6cb2d30180e7287c
 2016-08-25 01:25:46 +00:00
David Christie
0ae74a8ccd resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253 am: 187d841b75 
am: 7f2aaf204d

Change-Id: I64ff311815620d7e26ef91d33afc8499abf63c83
 2016-08-25 01:25:38 +00:00
David Christie
4f1d1fc92d resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7 
am: 00e1e39ae2

Change-Id: I23587e80ea85f66e872e8bf0a9b1f83399c3b6fc
 2016-08-25 01:25:30 +00:00
Dirk Dougherty
169f86ce7a Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead... 
Change-Id: I1d41485aceef95e666223d63aea7e8eefb95c947
 2016-08-24 18:00:56 -07:00
David Christie
36246a43e5 resolve merge conflicts of 8aaffd9 to nyc-dev 
Change-Id: I4b1603b4cb1cdfc01f4842b2facf8c31a687bbe5
 2016-08-24 16:45:01 -07:00
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
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