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

200067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
4b23a8149b Import translations. DO NOT MERGE 
Change-Id: I1e80237aa0c299f831687de31cb85cf2658d3f3f
Auto-generated-cl: translation import
 2015-09-23 01:54:57 -07:00
Soonil Nagarkar
79490dbacd Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 2015-09-23 01:34:53 +00:00
Jorim Jaggi
302475e93c Fix verifyUnlock 
Bug: 23970549
Change-Id: I899d8a92050c257217fa8528c33cb4592ad6d76a
 2015-09-23 00:57:50 +00:00
Jorim Jaggi
1b68e8b711 Log time difference between power button presses for gesture 
Bug: 24304031
Change-Id: Iab755268ee6d5c0c00836a6f68e65a74286074cf
 2015-09-22 17:05:12 -07:00
Baligh Uddin
d2b597d1fd Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev 2015-09-22 20:50:02 +00:00
Adam Lesinski
1b57758a1b Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev 2015-09-22 18:33:14 +00:00
Andreas Gampe
b49245f962 Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev 2015-09-22 18:27:39 +00:00
Adam Lesinski
52290c9c4f Fix Array Index Out of Bounds in BatteryStatsImpl 
If the power profile was not set yet, the default sizes of
cpu freq arrays could have been too small.

Bug:24244089
Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00
 2015-09-21 17:38:52 -07:00
Andreas Gampe
06bb908b78 Frameworks/base: Propagate boot status to installd 
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
 2015-09-21 15:16:13 -07:00
Zach Jang
88f92ec5a7 am fed28546: am 3e344f3f: (-s ours) am ba80596b: 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 'fed2854653d7e9d596cf1d9cb9c41ff05e744e94':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:37:34 +00:00
Zach Jang
c53f18b7b3 am 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '937141cb75160a1a51b9568481225aec286c5a86':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:37:30 +00:00
Zach Jang
fed2854653 am 3e344f3f: (-s ours) am ba80596b: 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 '3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:30:32 +00:00
Zach Jang
937141cb75 am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '0cae8381666248e44875756e72998e55ed3f9151':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:30:27 +00:00
Zach Jang
3e344f3fcb am ba80596b: 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 'ba80596bc0d51b3ddf14c1612c341992bc3ac5fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:07:04 +00:00
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
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
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
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
Baligh Uddin
14d7a10a80 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:35 +00:00
Baligh Uddin
39dc2f3156 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:31 +00:00
Baligh Uddin
dc6c52779f Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:28 +00:00
Baligh Uddin
5aecb21d8b Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:25 +00:00
Baligh Uddin
396c4a7345 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:23 +00:00
Baligh Uddin
6fad59a41a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:43:21 +00:00
Baligh Uddin
2deb87d4df Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:35:14 +00:00
Baligh Uddin
ce992f1b58 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:35:12 +00:00
Justin Harrison
91f2123b2a Merge "Add support for setting color transforms" into mnc-dr-dev 2015-09-19 00:21:41 +00:00
Tim Kilbourn
0eb10ede23 Merge "Always set the usb config when modifying it." into mnc-dr-dev 2015-09-18 23:55:56 +00:00
Michael Wright
58e829f71d Add support for setting color transforms 
Bug: 24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
 2015-09-18 23:37:28 +00:00
Vineeta Srivastava
22fe39b49c Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev 2015-09-18 22:19:41 +00:00
Adam Lesinski
e54253bdd3 Merge "Fix crash when no power_profile is specified" into mnc-dr-dev 2015-09-18 22:15:19 +00:00
sangjoon84.lee
d4bcb286fb set config_use_sim_language_file false for SE Telia/Sweden 3G 
BUG=24184934

Change-Id: I721b3e6c29b78a792a15ab4ba72a81a3f4ce270d
 2015-09-18 15:15:16 -07:00
Tim Kilbourn
823e805c1c Always set the usb config when modifying it. 
On some devices, setting system properties takes too long and we end up
with races where adbd gets killed and never comes back. With this
change we avoid a small optimization that checks the previous value of
the config, instead opting to set it every time.

Bug: 23631400
Change-Id: I7567cc2efb3d5d15c45334bd66b28877a2af0ac3
 2015-09-18 15:05:57 -07:00
Adam Lesinski
8057133d49 Fix crash when no power_profile is specified 
Always connected devices don't have power_profiles,
so handle the case where the default cpu speed count of
1 is used on a device with more cpu speeds.

Bug:23776983
Change-Id: Ifdddad2f28eea5b730833622a6b6043b3086efd2
 2015-09-18 14:56:34 -07:00
Baligh Uddin
a9fc533b09 Import translations. DO NOT MERGE 
Change-Id: I08b112bde5280593b52c7aa50b56d41092f94056
Auto-generated-cl: translation import
 2015-09-18 14:17:59 -07:00
Baligh Uddin
550ac93a79 Import translations. DO NOT MERGE 
Change-Id: I81add884ffd46b17bed8f38abb835c79aeb4752f
Auto-generated-cl: translation import
 2015-09-18 14:15:54 -07:00
Baligh Uddin
c05142c052 Import translations. DO NOT MERGE 
Change-Id: Ie83919c03d360d8955701954b4888e0e7ac51aae
Auto-generated-cl: translation import
 2015-09-18 14:06:53 -07:00
Baligh Uddin
0472798681 Import translations. DO NOT MERGE 
Change-Id: I1a186ed5db66f57c223a432802d130165bfcb5d4
Auto-generated-cl: translation import
 2015-09-18 14:04:36 -07:00