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

168605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
387116f557 am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni" 
* commit 'c3507d1098a444176a7270cba7e5299af7f77350':
  Frameworks/base: Replace LOG_FATAL_IF in core/jni
 2014-11-19 18:26:51 +00:00
Andres Morales
39843bfbed am 29db396e: am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '29db396ea91651f2f17e21629f782ce4c19e0f33':
  Add a checksum to FRP partition
 2014-11-19 18:21:19 +00:00
Andreas Gampe
c3507d1098 Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni" 2014-11-19 18:16:19 +00:00
Andres Morales
29db396ea9 am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '6722598ef3d23f75d244399536b2302b30388c51':
  Add a checksum to FRP partition
 2014-11-19 18:16:03 +00:00
Andres Morales
6722598ef3 Merge "Add a checksum to FRP partition" into lmp-mr1-dev 2014-11-19 18:09:53 +00:00
Chih-hung Hsieh
b380d7eeee am b1e4e89b: Merge "Fix incorrect usage of bool" 
* commit 'b1e4e89b86ee12335fa1398a6b2bc0a0604599de':
  Fix incorrect usage of bool
 2014-11-19 18:09:25 +00:00
Chih-hung Hsieh
b1e4e89b86 Merge "Fix incorrect usage of bool" 2014-11-19 18:01:20 +00:00
Amit Mahajan
bb35bbf198 am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit '6f10d1c34efba28856fea162f1d193319cad2576':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:57:39 +00:00
John Spurlock
34a2ee695d am 9d48ec7a: am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '9d48ec7a5c639226f69377d41c4fcb2d3e17c13e':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 17:57:25 +00:00
Geoff Mendal
88a080bc68 am 5b95c755: (-s ours) am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '5b95c755821a966b411b164df18b928d2eda71f1':
  Import translations. DO NOT MERGE
 2014-11-19 17:56:45 +00:00
Geoff Mendal
e409561a17 am cfe34ebc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'cfe34ebce6d2a6bd4f682d8f002b8318942ec30d':
  Import translations. DO NOT MERGE
 2014-11-19 17:56:30 +00:00
Jeff Sharkey
e5186c12ec am 40602179: Merge "Default icon is shown after uninstalling updated priv-app" 
* commit '4060217905d805897141b028126e0aa51136cf7b':
  Default icon is shown after uninstalling updated priv-app
 2014-11-19 17:49:07 +00:00
Amit Mahajan
6f10d1c34e am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'b22462c57f35404f5b39680a9fb76165968d8faf':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:44:33 +00:00
Jeff Sharkey
4060217905 Merge "Default icon is shown after uninstalling updated priv-app" 2014-11-19 17:40:02 +00:00
Amit Mahajan
b22462c57f Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 2014-11-19 17:38:23 +00:00
John Spurlock
9d48ec7a5c am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '2ee054b4f099ce67dffc29329612170305053783':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 17:24:09 +00:00
Andreas Gampe
987f79f60b Frameworks/base: Replace LOG_FATAL_IF in core/jni 
Do not use LOG_FATAL_IF in JNI setup. This is one-time on startup
and important enough to always check.

Add a header with common helper definitions. Move to inlined functions
instead of macros to clean up the code.

Change-Id: Ib12d0eed61b110c45d748e80ec36c563e9dec7e5
 2014-11-19 09:21:12 -08:00
John Spurlock
2ee054b4f0 Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 2014-11-19 17:19:15 +00:00
Geoff Mendal
5b95c75582 am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '9792edd17c777118f64a585272c9f11112cb22d7':
  Import translations. DO NOT MERGE
 2014-11-19 16:59:27 +00:00
Geoff Mendal
9792edd17c am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '5fafd21b1f15930b729f067be7d2c584add3217b':
  Import translations. DO NOT MERGE
 2014-11-19 16:55:43 +00:00
John Spurlock
5eb21f3466 Volume: Ensure ring/notif slider is enabled when ringer=vibrate. 
Although the audio policy makes a distinction between voice capable
and not when determining the default active stream, have the panel
recognize this condition and behave the same way (enable the slider)
on all devices.

Bug: 17405530
Change-Id: If3e1af3078f47bc1205545e919ccc6206020e7b2
 2014-11-19 11:54:53 -05:00
Geoff Mendal
cfe34ebce6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-19 16:49:40 +00:00
Geoff Mendal
5fafd21b1f Import translations. DO NOT MERGE 
Change-Id: I97c8d622957c88f2186e7d3116726b7ba33703c7
Auto-generated-cl: translation import
 2014-11-19 07:52:29 -08:00
Geoff Mendal
0f2e8a9fd3 Import translations. DO NOT MERGE 
Change-Id: Ic62940d6ffe06c77d7eacfcf53af30850a7e3d38
Auto-generated-cl: translation import
 2014-11-19 07:46:41 -08:00
Geoff Mendal
49a93f520f am 0014addf: (-s ours) am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '0014addf883675613648713e7c01b70fb780a5dc':
  Import translations. DO NOT MERGE
 2014-11-19 15:28:42 +00:00
Geoff Mendal
0014addf88 am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '04b6a6d3a17e40599d90ccabc6a8481a62dd2ae1':
  Import translations. DO NOT MERGE
 2014-11-19 15:25:23 +00:00
Geoff Mendal
04b6a6d3a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-19 15:19:34 +00:00
Geoff Mendal
2a42085896 Import translations. DO NOT MERGE 
Change-Id: Ibfc1a6ef7529620c86fb25ac4ae4b27258a810c1
Auto-generated-cl: translation import
 2014-11-19 07:17:01 -08:00
Jason Monk
4854657f0e am 90bec300: am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '90bec3001294601227c3578377325224b02180cc':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:07:54 +00:00
Jason Monk
90bec30012 am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '56dd1f1eb6fdca10ea2f33d8420e6051e14ed435':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:03:46 +00:00
Jason Monk
56dd1f1eb6 Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 2014-11-19 14:58:40 +00:00
Nicolas Prevot
9b07760dbc am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '439f17e622b3aaca2003eeeee2bb423abe6777a9':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 10:01:51 +00:00
Nicolas Prevot
439f17e622 am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '76ea69b35e45f4b23dfb7b39c6cd790b00576526':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 09:55:44 +00:00
Nicolas Prevot
76ea69b35e Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 2014-11-19 09:46:54 +00:00
Alan Viverette
ea3219ffa9 am 4be155e8: am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 
* commit '4be155e81aae4fe1354ebc5abe9d55c33723fa4f':
  Re-initialize data when changing time picker 24-hour mode
 2014-11-19 02:42:06 +00:00
Alan Viverette
4be155e81a am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 
* commit 'a489f0b3d9007d94ba514bf4ce71ce9957147e33':
  Re-initialize data when changing time picker 24-hour mode
 2014-11-19 02:34:59 +00:00
Alan Viverette
a489f0b3d9 Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 2014-11-19 02:28:37 +00:00
Alan Viverette
448ff718a0 Re-initialize data when changing time picker 24-hour mode 
BUG: 18381313
Change-Id: Ie1fa9fbbf8edadfda71cf0ad4f1c39395e56ecc7
 2014-11-18 18:28:04 -08:00
Amit Mahajan
4fea0923be Adding new setting LTE_SERVICE_FORCED. 
Bug: 18328639
Change-Id: Icbf9d7987d27af34cbe4ee1b4e9df19e139c2fc7
 2014-11-18 17:34:36 -08:00
Akira Numata
e50bc6fd29 Default icon is shown after uninstalling updated priv-app 
If updated pre-installed app is moved from "/system/app" to
"/system/priv-app" at FOTA, PackageManager does not update its
resource path correctly. This patch fixes it.

Change-Id: Iac793bcb8fd7c5bfbafd1876640b534c6da5dddf
 2014-11-19 09:57:19 +09:00
Jinsuk Kim
d565e0337f am 0beb76e1: am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 
* commit '0beb76e108721a009381a84bde024fc9995eeed9':
  CEC: Use thread-safe version for avr info
 2014-11-19 00:36:27 +00:00
Jeff Hao
e5facf356b am a1f5fc08: am 1c49a612: am c6fdda52: (-s ours) Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev 
* commit 'a1f5fc088d2532f020905fbab5a30bd6aac1aea5':
  Frameworks/base: Compiled-classes support
 2014-11-19 00:32:03 +00:00
Jinsuk Kim
0beb76e108 am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 
* commit '9899b663f4c512e4a9acaa5508f0fd86bed6e476':
  CEC: Use thread-safe version for avr info
 2014-11-19 00:31:59 +00:00
Jinsuk Kim
9899b663f4 Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 2014-11-19 00:25:43 +00:00
Jeff Hao
a1f5fc088d am 1c49a612: am c6fdda52: (-s ours) Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev 
* commit '1c49a6124b1bcada842cf46caf331f81717376bc':
  Frameworks/base: Compiled-classes support
 2014-11-19 00:23:05 +00:00
Jeff Sharkey
8bbdd1ce48 am c5efb2b9: am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 
* commit 'c5efb2b92a2901f71ebcab039fec24b6dd0ab927':
  Speed up GrantUri.hashCode().
 2014-11-19 00:20:50 +00:00
Andreas Gampe
2cabf4a93d Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-11-19 00:20:49 +00:00
Christopher Tate
1f284855fc am f066bf22: am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev 
* commit 'f066bf229cd28210af476a7a02b6901e0bd9e829':
  Prevent some alarm pathologies
 2014-11-19 00:19:56 +00:00
Rubin Xu
3c1d5e2f9d am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '40603baa3ec570b1cb423e3488125b1dd35cb5e9':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:19:50 +00:00
Rubin Xu
f978e667a6 am 0122db0a: am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit '0122db0a6397f5bd08042e1a5919114e3cccb9f4':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:19:43 +00:00