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

205165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Jang
0cae838166 am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'b5173241d160a5b6f4d440a01c9a9b0281ee4e66':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:06:58 +00:00
Jeff Sharkey
9314f94b68 am b7b17fa6: am 281a868c: am e1a6299b: Relax locking when scanning private volumes. 
* commit 'b7b17fa6a14a6916f12568f02360a1ec1792f256':
  Relax locking when scanning private volumes.
 2015-09-21 20:48:56 +00:00
Jeff Sharkey
b7b17fa6a1 am 281a868c: am e1a6299b: Relax locking when scanning private volumes. 
* commit '281a868c69e0915efc16eb3c65f669bbf0df69df':
  Relax locking when scanning private volumes.
 2015-09-21 20:40:08 +00:00
Jeff Sharkey
281a868c69 am e1a6299b: Relax locking when scanning private volumes. 
* commit 'e1a6299b994bbdb304550e00d5b3b26a064bdf0c':
  Relax locking when scanning private volumes.
 2015-09-21 20:29:58 +00:00
Zach Jang
ba80596bc0 am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'f8cda08986a5caa14daace69e24c82224ac5a9fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 19:10:51 +00:00
Zach Jang
b5173241d1 am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'e54c195a53694696e0913722fa721c882e33753e':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 19:10:46 +00:00
Zach Jang
f8cda08986 am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'b2b3cecbd3de80d40f8c207c6aa94532c3426829':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 18:58:27 +00:00
Zach Jang
e54c195a53 am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 18:58:18 +00:00
Robert Carr
64b5e1c4f9 Enforce a timeout for Content Providers to be published. 
ActivityManagerService: In the case where we are launching
an application on behalf of a Content Provider request,
enforce a timeout inbetween the application attaching and
the content providers being published. Consider that a defective
content provider may block in ContentProvider::onCreate
indefinitely: in such a case the PROC_START_TIMEOUT has already
been removed as the activity manager must have called bindApplication.

In these cases, there will be nothing to wake threads blocking
on the (non timed) wait for provider to be published at the end of
ActivityManagerService::getContentProviderImpl. This can cause binder
threads to block 1 by 1 until eventually AMS runs out and becomes
unresponsive.

Bug: 22141958
Change-Id: I2226da5df5c79b37f0b896423b3c1eaa4a7ecbba
(cherry picked from commit da33c13434cb20a11b522374411a5b819503e4e0)
 2015-09-21 18:03:50 +00:00
Soonil Nagarkar
d642698a81 Fix reintroduction of b/10845061 
Prevent crash in case where NLP is not available. Also fix an integer
overflow bug that remained uncaught.

BUG: 22345134
Change-Id: If6ff7b12f0d15bb2fe97589f8b0be10f9ed06197
(cherry picked from commit 2ec5c5cced4bd5b9dfbb7578f573c56b3bbc7ddf)
 2015-09-21 17:40:32 +00:00
Gus Prevas
448ada6286 am 1f66ec8b: Merge "Allows starting window to be shown for swipe-dismiss windows." into cw-e-dev 
* commit '1f66ec8b908bb37c342c8bf97f74ecce913bfcc3':
  Allows starting window to be shown for swipe-dismiss windows.
 2015-09-21 14:08:50 +00:00
Gus Prevas
1f66ec8b90 Merge "Allows starting window to be shown for swipe-dismiss windows." into cw-e-dev 2015-09-21 14:02:43 +00:00
Erik Kline
2a06860609 am c89f3a48: am 7aa79efe: Grab a wakelock while doing ARP/ND probing 
* commit 'c89f3a483330498d69a6c706b78c3a0aea5298a0':
  Grab a wakelock while doing ARP/ND probing
 2015-09-21 12:09:06 +00:00
Erik Kline
c89f3a4833 am 7aa79efe: Grab a wakelock while doing ARP/ND probing 
* commit '7aa79efe80b790eef61ac355c0ce6c7b606e6f78':
  Grab a wakelock while doing ARP/ND probing
 2015-09-21 12:00:25 +00:00
Erik Kline
7aa79efe80 Grab a wakelock while doing ARP/ND probing 
Bug: 23197666
Change-Id: I5bf6e83b37fcd924f5f8e750f65bb5061f931e56
 2015-09-21 14:59:05 +09:00
Baligh Uddin
5c3ea10c7b am 331c3ec7: (-s ours) am 7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '331c3ec7835044aa9bc6da22bae71695920aae62':
  Import translations. DO NOT MERGE
 2015-09-19 03:08:01 +00:00
Baligh Uddin
957457a8fa am 861caaa9: (-s ours) am 462c76f1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '861caaa9ac3fb5dc8b832bc747fa90b001e5db41':
  Import translations. DO NOT MERGE
 2015-09-19 03:07:54 +00:00
Baligh Uddin
54368ed0c2 am 560a1551: (-s ours) am 78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '560a15512fbfdf0fe4801fef0c22079caf94623b':
  Import translations. DO NOT MERGE
 2015-09-19 03:07:46 +00:00
Baligh Uddin
2434a36da2 am af0c15d7: (-s ours) am 4cfcdac0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'af0c15d7bf3b409a1fa114304ed0c81924f055a6':
  Import translations. DO NOT MERGE
 2015-09-19 03:07:39 +00:00
Baligh Uddin
e97d2b1c55 am 9f46f1be: (-s ours) am 5eed30f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '9f46f1be1305533406549a6ec3150067ab823132':
  Import translations. DO NOT MERGE
 2015-09-19 03:07:33 +00:00
Baligh Uddin
042567fe79 am 0727c1bd: (-s ours) am 20094d70: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '0727c1bdad8b503f868d1becba382c11a4bf4157':
  Import translations. DO NOT MERGE
 2015-09-19 03:07:26 +00:00
Baligh Uddin
3eb0ccbde5 am 684a63f1: (-s ours) am 18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '684a63f169ec3f34aa23e0b47df1158e1d230bcd':
  Import translations. DO NOT MERGE
 2015-09-19 03:07:16 +00:00
Baligh Uddin
d542fb052e am 26d1a338: (-s ours) am 14d7a10a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '26d1a338431819d3c0ebb4fe7d4eb53e8735fc10':
  Import translations. DO NOT MERGE
 2015-09-19 03:07:09 +00:00
Baligh Uddin
d88b143705 am 2f52c65c: (-s ours) am 39dc2f31: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '2f52c65c72e16f82bcf2f18ffef5375f4382abb1':
  Import translations. DO NOT MERGE
 2015-09-19 03:06:58 +00:00
Baligh Uddin
57e83d5352 am 06f02f3e: (-s ours) am dc6c5277: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '06f02f3e14474aab5d4994e4603eda5a54180b13':
  Import translations. DO NOT MERGE
 2015-09-19 03:06:52 +00:00
Baligh Uddin
8ac405074d am 40507863: (-s ours) am 5aecb21d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '4050786337de85f81735835117222987a4772dc9':
  Import translations. DO NOT MERGE
 2015-09-19 03:06:45 +00:00
Baligh Uddin
57861323e9 am 27afa63a: (-s ours) am 396c4a73: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '27afa63a9d336ea8740d7bb9014a3a0b65d32b45':
  Import translations. DO NOT MERGE
 2015-09-19 03:06:37 +00:00
Baligh Uddin
3c25fc89fe am 075a4c9c: (-s ours) am 6fad59a4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '075a4c9c54566f3125b16bf652d9d2a2c67c6a8e':
  Import translations. DO NOT MERGE
 2015-09-19 03:06:30 +00:00
Baligh Uddin
331c3ec783 am 7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '7bd7a2426466a01c94b2d12a1fa10e038249473b':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:57 +00:00
Baligh Uddin
861caaa9ac am 462c76f1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '462c76f129bd2633ddb01db3ed9d45d2ea2f84d9':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:52 +00:00
Baligh Uddin
560a15512f am 78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '78ef803faf8cf780d9c2f232c73f24f0990fe6d1':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:49 +00:00
Baligh Uddin
af0c15d7bf am 4cfcdac0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '4cfcdac0fba42eb6d7faef7ab8f1188204e6508f':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:44 +00:00
Baligh Uddin
9f46f1be13 am 5eed30f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5eed30f30c0476411a51d97c411a62b72d5861b5':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:39 +00:00
Baligh Uddin
0727c1bdad am 20094d70: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '20094d70ac08db3bbdcf363cb3bd1e4550ab8d23':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:35 +00:00
Baligh Uddin
684a63f169 am 18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '18b2419d991cce0328db13696436102bbce0d8ff':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:30 +00:00
Baligh Uddin
26d1a33843 am 14d7a10a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '14d7a10a805e6eb9849a9871d5a90c0fb5a24e35':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:25 +00:00
Baligh Uddin
2f52c65c72 am 39dc2f31: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '39dc2f31563901b0d81d89ce1b65e2c4d41eec9f':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:19 +00:00
Baligh Uddin
06f02f3e14 am dc6c5277: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'dc6c52779ff39486f8dd3c367a7b0040396c81fa':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:14 +00:00
Baligh Uddin
4050786337 am 5aecb21d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5aecb21d8b2a4841a60d1ab49ef9ee687ae63b30':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:10 +00:00
Baligh Uddin
27afa63a9d am 396c4a73: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '396c4a7345f999713314ced12f99148846f849d6':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:05 +00:00
Baligh Uddin
075a4c9c54 am 6fad59a4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '6fad59a41ad383b5010c565da3d284c29aea8183':
  Import translations. DO NOT MERGE
 2015-09-19 02:56:01 +00:00
Baligh Uddin
c488631ef0 am cbf24e12: (-s ours) am 2deb87d4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'cbf24e129cb30bdac485e9e22c2c835f940df4bc':
  Import translations. DO NOT MERGE
 2015-09-19 02:49:16 +00:00
Baligh Uddin
d159a208a4 am a64c3e57: (-s ours) am ce992f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'a64c3e57baeec6f3b7ce70d098a81c3b33dc5f55':
  Import translations. DO NOT MERGE
 2015-09-19 02:49:07 +00:00
Baligh Uddin
7bd7a24264 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:45:29 +00:00
Baligh Uddin
462c76f129 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:45:16 +00:00
Baligh Uddin
78ef803faf Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:50 +00:00
Baligh Uddin
4cfcdac0fb Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:47 +00:00
Baligh Uddin
5eed30f30c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:44 +00:00
Baligh Uddin
20094d70ac Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:42 +00:00
Baligh Uddin
18b2419d99 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:39 +00:00