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

174335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
33f97d8304 am 77fe4c96: am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit '77fe4c96b75550e5d22a294314b05beabd55e97a':
  Fix WPS docs for LABEL method
 2014-11-19 22:21:38 +00:00
Mathieu Chartier
96555a00f8 am 8415672e: am 1073f202: am 36c7f4b6: Merge "Add zygote space to Dalvik Heap" 
* commit '8415672e18cc6666d040435105fc7566ca525af4':
  Add zygote space to Dalvik Heap
 2014-11-19 22:17:21 +00:00
Vinit Deshpande
77fe4c96b7 am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit 'a34f3d30c6a7a4b8863175f009935c61ace42b4e':
  Fix WPS docs for LABEL method
 2014-11-19 22:13:18 +00:00
Mathieu Chartier
8415672e18 am 1073f202: am 36c7f4b6: Merge "Add zygote space to Dalvik Heap" 
* commit '1073f2023efcc6cbd099358677d3e87ee996486d':
  Add zygote space to Dalvik Heap
 2014-11-19 22:09:29 +00:00
Ignacio Solla
81b104b3a8 am b85b969b: (-s ours) am c48a7bb1: (-s ours) am 1228e58e: (-s ours) Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)" 
* commit 'b85b969b6076356505f75448e2703b0a33ba5bbf':
  [WebView] Interface to access hidden APIs. (DO NOT MERGE)
 2014-11-19 22:09:22 +00:00
Ignacio Solla
b85b969b60 am c48a7bb1: (-s ours) am 1228e58e: (-s ours) Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)" 
* commit 'c48a7bb12d1e39dff5b9d28805e0c75bca9149fa':
  [WebView] Interface to access hidden APIs. (DO NOT MERGE)
 2014-11-19 22:05:15 +00:00
Mathieu Chartier
1073f2023e am 36c7f4b6: Merge "Add zygote space to Dalvik Heap" 
* commit '36c7f4b67326bad547f16aa6e72140bd839ab28d':
  Add zygote space to Dalvik Heap
 2014-11-19 22:04:28 +00:00
Ignacio Solla
c48a7bb12d am 1228e58e: (-s ours) Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)" 
* commit '1228e58e88ac0ae2abb698ed3f933ac44a8851ee':
  [WebView] Interface to access hidden APIs. (DO NOT MERGE)
 2014-11-19 21:59:37 +00:00
Mathieu Chartier
36c7f4b673 Merge "Add zygote space to Dalvik Heap" 2014-11-19 21:58:17 +00:00
Mathieu Chartier
99f628286f Add zygote space to Dalvik Heap 
Broken by
https://android-review.googlesource.com/#/c/115446/

This change fixes it by correctly putting the zygote in Dalvik Heap
instead of Dalvik Other.

Bug: 18447855

(cherry picked from commit 7fc9176c8a2102fb5be3668404bd15feb6878c89)

Change-Id: I9293e5d3f55ccfb2c93c6aacbf6abc164eacb10b
 2014-11-19 13:54:00 -08:00
Ignacio Solla
1228e58e88 Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)" 2014-11-19 21:53:43 +00:00
Ignacio Solla
e7cf27b664 [WebView] Interface to access hidden APIs. (DO NOT MERGE) 
The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
(cherry picked from commits 94ef789f0cf0387df20c2c602857ada1e5abfdd6
 and 53f256948724b8d4009d8a8a47da96a06402f9a2)
 2014-11-19 21:47:13 +00:00
Vinit Deshpande
a34f3d30c6 am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit '800bf3ae6e9affb151b3b0b368c4a3dd22bb1fa0':
  Fix WPS docs for LABEL method
 2014-11-19 20:29:56 +00:00
Vinit Deshpande
800bf3ae6e Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 2014-11-19 20:17:22 +00:00
Andrew Lee
fc865670b6 am 76cc56c0: am 3f424477: am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 
* commit '76cc56c0f94ff8f965ab33663649c100d86e4e9e':
  Add GENERIC_CONFERENCE to phone capabilities.
 2014-11-19 19:18:05 +00:00
Andrew Lee
76cc56c0f9 am 3f424477: am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 
* commit '3f4244773d4479c79705dc397abf0d76555d7ef9':
  Add GENERIC_CONFERENCE to phone capabilities.
 2014-11-19 19:10:44 +00:00
Andrew Lee
3f4244773d am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 
* commit 'e6a1e993c2e3663ee60085b66fe8697d5de6e268':
  Add GENERIC_CONFERENCE to phone capabilities.
 2014-11-19 19:06:32 +00:00
Andrew Lee
e6a1e993c2 Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 2014-11-19 19:00:41 +00:00
Andreas Gampe
10e4a45f69 am 387116f5: am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni" 
* commit '387116f557c3d3ecf7bd82e1d9dd1910ca4c4a3d':
  Frameworks/base: Replace LOG_FATAL_IF in core/jni
 2014-11-19 18:31:11 +00:00
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
2ccf4779ad am 39843bfb: am 29db396e: am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '39843bfbedd0bf51ae0214869ac54e39c1126205':
  Add a checksum to FRP partition
 2014-11-19 18:26:36 +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
Chih-hung Hsieh
e0fd617dba am b380d7ee: am b1e4e89b: Merge "Fix incorrect usage of bool" 
* commit 'b380d7eeee2ea73bcd2bfdf0b0b3339ab93ff75c':
  Fix incorrect usage of bool
 2014-11-19 18:15:08 +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
Amit Mahajan
5ed01f6427 am bb35bbf1: am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'bb35bbf198201fc00858ea56cdf97eae8f2cfdbb':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 18:05:33 +00:00
John Spurlock
ee33301aae am 34a2ee69: am 9d48ec7a: am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '34a2ee695d7411c6b9abd7db3fd105851092bafb':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 18:05:28 +00:00
Geoff Mendal
982c75c321 am 88a080bc: (-s ours) am 5b95c755: (-s ours) am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '88a080bc68de7590c4ee1bc69fa9dbd40f6a9055':
  Import translations. DO NOT MERGE
 2014-11-19 18:05:24 +00:00
Geoff Mendal
ecd5556114 am e409561a: (-s ours) am cfe34ebc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e409561a1757cd9004e50ce5ab3c4e29a747a3c5':
  Import translations. DO NOT MERGE
 2014-11-19 18:05:19 +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
Jeff Sharkey
c4b41f565a am e5186c12: am 40602179: Merge "Default icon is shown after uninstalling updated priv-app" 
* commit 'e5186c12ec1c95b75d0fef1a38f94483e31aae6f':
  Default icon is shown after uninstalling updated priv-app
 2014-11-19 17:57:15 +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
Geoff Mendal
9ca494586f Merge "Import translations. DO NOT MERGE" 2014-11-19 17:53:08 +00:00
Geoff Mendal
1b23d21ea6 Import translations. DO NOT MERGE 
Change-Id: I35294245089a3132a78442f80df66990de0a1c43
Auto-generated-cl: translation import
 2014-11-19 09:51:54 -08: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