Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,355 Commits 3 Branches 0 Tags
5bec0266358f28a91b38f8aefbcb918219aa4ce9
Commit Graph

174355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
5bec026635 Fix Crash when sending null in HashMap to getKeyRequest 
Merge of partner https://android-review.googlesource.com/#/c/115665

Change-Id: I50235dc09be584165155019a70708377ca9688a0
 2014-11-20 18:39:59 +00:00
Narayan Kamath
b951370724 am 0d22608c: resolved conflicts for merge of bcb86374 to lmp-mr1-dev-plus-aosp 
* commit '0d22608cf3cedc6e83b90b571b1042a0a714c983':
  Tell installd when boot completes.
 2014-11-20 11:04:24 +00:00
Narayan Kamath
0d22608cf3 resolved conflicts for merge of bcb86374 to lmp-mr1-dev-plus-aosp 
Change-Id: I68bd16ed55f9e3794049051184f82503f679667c
 2014-11-20 10:59:07 +00:00
Narayan Kamath
bcb86374dc am 9f285bd6: Merge "Tell installd when boot completes." 
* commit '9f285bd60b219b562bc55c7c2a9fae23eae554e5':
  Tell installd when boot completes.
 2014-11-20 10:51:26 +00:00
Narayan Kamath
9f285bd60b Merge "Tell installd when boot completes." 2014-11-20 10:47:17 +00:00
Riley Andrews
6d354163ca [wip] Make the window animator rely on frameTime. 
The window animator is looking at cpu time difference
whilst updating animations. Using the choreographer display frame
time will be a much more consistent way of estimating
the time between frames for animation.

Change-Id: If5c4034c6e1b017749d6f4ca727d564805672c39
 2014-11-20 01:45:04 +00:00
Scott Main
5208c59a12 Merge "docs: workflow index" 2014-11-20 01:36:35 +00:00
Scott Main
65b04adb3e Merge "docs: tools help update" 2014-11-20 01:36:18 +00:00
Scott Main
02a8637134 Merge "docs:revision updates" 2014-11-20 01:35:29 +00:00
Elliott Hughes
8e52c46c0e am 6973a63e: am ec2d8d0b: am ea8ff822: Merge "Fix and be more explicit about plurals best practices." 
* commit '6973a63e967a8c913afa603b312ec9516f19d4fb':
  Fix and be more explicit about plurals best practices.
 2014-11-20 00:31:54 +00:00
Elliott Hughes
6973a63e96 am ec2d8d0b: am ea8ff822: Merge "Fix and be more explicit about plurals best practices." 
* commit 'ec2d8d0bb8a36355b8d687c660b5c64e4aebd9b8':
  Fix and be more explicit about plurals best practices.
 2014-11-20 00:27:29 +00:00
Elliott Hughes
ec2d8d0bb8 am ea8ff822: Merge "Fix and be more explicit about plurals best practices." 
* commit 'ea8ff822121cde16344ba2db194a5f17283fa740':
  Fix and be more explicit about plurals best practices.
 2014-11-20 00:22:37 +00:00
Elliott Hughes
ea8ff82212 Merge "Fix and be more explicit about plurals best practices." 2014-11-20 00:19:45 +00:00
Elliott Hughes
1fe7d496db Fix and be more explicit about plurals best practices. 
The "one" case should always include %d. Say so, and fix our examples.
Also make it clear that developers should always provide exactly "one"
and "other".

Bug: 18429565
Change-Id: I09eb39ea6986850c3af28cca3052d319e3c97705
 2014-11-19 16:18:45 -08:00
Chris Craik
31b4d9fbc8 Merge "Fix missing ellipsis when just one character is truncated" 2014-11-19 23:57:51 +00:00
Raph Levien
93e48e8cf1 Fix missing ellipsis when just one character is truncated 
The "moreChars" test in StaticLayout's generate method would evaluate to
false when the last character in a word caused the break. This in turn
suppressed the ellipsis in this case. The proposed fix is always to set
moreChars true in the code path where the line is broken because more
text wouldn't fit.

Bug: 17738112
Change-Id: Ifa1a69841ca952da4d1937dc8326778179b026b3
 2014-11-19 15:39:34 -08:00
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 7fc9176c8a)

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 94ef789f0c
 and 53f2569487)
 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