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

185627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dong Zhou
94573dc551 am 89f41eb3: Define the capability to speed up MT call audio 
* commit '89f41eb39e910e220957ac861651ead17eff9085':
  Define the capability to speed up MT call audio
 2015-03-17 22:28:22 +00:00
Kenny Root
4ff668d47a Track change to Conscrypt 
(cherry picked from commit 9d2d6b6b4b1b16221cbd857703cd6301c6bf873c)

Bug: 19798387
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
 2015-03-17 22:22:48 +00:00
Kenny Root
fbd8805cd7 Merge "Track change to Conscrypt" into lmp-mr1-ub-dev 2015-03-17 22:21:58 +00:00
Dong Zhou
89f41eb39e Define the capability to speed up MT call audio 
Bug: 19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
 2015-03-17 22:16:52 +00:00
Julia Reynolds
1cc84c992c Merge "Allow initializers to clear reset protection data during device setup." 2015-03-17 22:13:32 +00:00
Andreas Gampe
7463438912 am 46277ba2: am 28e6aeca: Merge "Frameworks/base: Make IDENTITY_MATRIX final" 
* commit '46277ba2c70e9fe0fc9772dcb84040aff1c322be':
  Frameworks/base: Make IDENTITY_MATRIX final
 2015-03-17 22:02:36 +00:00
Andreas Gampe
9a9b45c285 am d6f25364: am 9568772a: Merge "Frameworks/base: Fix format string in Geofence" 
* commit 'd6f25364eed09d39b493488cd6adaa02e0d8a252':
  Frameworks/base: Fix format string in Geofence
 2015-03-17 22:02:29 +00:00
Svetoslav Ganov
e1519582ab Revert "Persist settings on a normal priority thread." 
This reverts commit d289e64a2d7c8efba78b9066b647ee321eba701a.

Change-Id: Ic9455b538e0be8b9a4e4672f99b14978e70d2911
 2015-03-17 22:00:37 +00:00
Andreas Gampe
46277ba2c7 am 28e6aeca: Merge "Frameworks/base: Make IDENTITY_MATRIX final" 
* commit '28e6aeca3aad075ef4fd7aab08cd1ad1ff9eb555':
  Frameworks/base: Make IDENTITY_MATRIX final
 2015-03-17 21:43:01 +00:00
Andreas Gampe
d6f25364ee am 9568772a: Merge "Frameworks/base: Fix format string in Geofence" 
* commit '9568772acbf5b36f2edb41f7c5b06d499329add0':
  Frameworks/base: Fix format string in Geofence
 2015-03-17 21:42:55 +00:00
Andreas Gampe
28e6aeca3a Merge "Frameworks/base: Make IDENTITY_MATRIX final" 2015-03-17 21:33:09 +00:00
Andreas Gampe
399fa8a60a Frameworks/base: Make IDENTITY_MATRIX final 
Bug: 19797138
Change-Id: I127f24b7060a0c4dab401ce8e3057d362c6d6b06
 2015-03-17 21:31:42 +00:00
Andreas Gampe
9568772acb Merge "Frameworks/base: Fix format string in Geofence" 2015-03-17 21:30:49 +00:00
Andreas Gampe
1414a6291d Frameworks/base: Fix format string in Geofence 
%p is not a valid conversion in format strings. It is also superfluous,
as it is already known that location is null.

Bug: 19797138
Change-Id: I5784e28b05b4ca9aac57e0fc9da4a7f01d9b3247
 2015-03-17 21:30:20 +00:00
Kenny Root
693ea60e9e Track change to Conscrypt 
Change way in which an outside caller can get the preferred SSLContext.

(cherry picked from commit 8a970637208207955fb6a719bd82902384b3c743)

Bug: 19798387
Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
 2015-03-17 21:27:05 +00:00
James Cook
4d87285c31 Merge "Recents: Tapping on background returns to launcher" 2015-03-17 21:16:29 +00:00
Andreas Gampe
1938a389e7 am 3814163b: am aae42eb2: Merge "Frameworks/base: Fix format string in Camera" 
* commit '3814163b6ddc35292f6b25f782ad7a858c703c24':
  Frameworks/base: Fix format string in Camera
 2015-03-17 21:12:25 +00:00
Andreas Gampe
3814163b6d am aae42eb2: Merge "Frameworks/base: Fix format string in Camera" 
* commit 'aae42eb26176482b09f0846e6acf7efa844a0d23':
  Frameworks/base: Fix format string in Camera
 2015-03-17 21:05:48 +00:00
Andreas Gampe
b95d079c80 am e4bdf3c1: am be549f9b: Merge "Frameworks/base: Fix precedence bug" 
* commit 'e4bdf3c1c9e7be06b68cc32f9a492d512bf87528':
  Frameworks/base: Fix precedence bug
 2015-03-17 20:56:02 +00:00
Andreas Gampe
aae42eb261 Merge "Frameworks/base: Fix format string in Camera" 2015-03-17 20:52:21 +00:00
Andreas Gampe
02ffb2aad9 Frameworks/base: Fix format string in Camera 
One cannot print a boolean with %d. That will result in an exception.

Bug: 19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
 2015-03-17 20:51:38 +00:00
Andreas Gampe
e4bdf3c1c9 am be549f9b: Merge "Frameworks/base: Fix precedence bug" 
* commit 'be549f9b8e01f884a2cc2d668457c6b1c12ff4cc':
  Frameworks/base: Fix precedence bug
 2015-03-17 20:49:18 +00:00
Filip Gruszczynski
6bc51303b5 am d0663e03: am 7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev 
* commit 'd0663e03657704db8e9006a0a3aa919ed28c6d03':
  Add animation to zeroing burn in protection.
 2015-03-17 20:47:48 +00:00
Andreas Gampe
0fdfe72088 am c8484abb: am 0ae488e1: Merge "Frameworks/base: Use || instead of |" 
* commit 'c8484abbbde02171023f159491ca342186ae095c':
  Frameworks/base: Use || instead of |
 2015-03-17 20:47:41 +00:00
Andreas Gampe
d75a3b4d2c am 17eda7d0: am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation" 
* commit '17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a':
  Frameworks/base: Fix trivial equals implementation
 2015-03-17 20:47:33 +00:00
Craig Mautner
5f2bb4c9bc Fix bad nesting count when remote calls fail. 
The nesting count for services depends on callbacks decrementing
ServiceRecord.executeNesting in response to remote service calls. If a
remote call fails the callback does not get made and the nesting count
gets out of sync. This causes orphans in the executingServices set.

This fix makes the callback locally when the remote call fails.

TransactionTooLargeExceptions caused by Intents containing large
amounts of data were being caught and not propagated to the calling
methods.

This fix propagates TransactionTooLargeExceptions back to the calling
methods.

Fixes bug 19698308.

Change-Id: I9eb6ae414d14d6b3a2709abb1f2bdfbd4cbc3c03
 2015-03-17 13:46:50 -07:00
Filip Gruszczynski
d0663e0365 am 7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev 
* commit '7bd2feda9e146c90c8720d8aa213ebcd9c30430c':
  Add animation to zeroing burn in protection.
 2015-03-17 20:44:58 +00:00
Andreas Gampe
c8484abbbd am 0ae488e1: Merge "Frameworks/base: Use || instead of |" 
* commit '0ae488e1cb64318906397a40d8be4866e81e4860':
  Frameworks/base: Use || instead of |
 2015-03-17 20:41:04 +00:00
Andreas Gampe
17eda7d0be am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation" 
* commit '4d9076437c0270cd863493f505e734a3108e89ea':
  Frameworks/base: Fix trivial equals implementation
 2015-03-17 20:40:58 +00:00
Filip Gruszczynski
7bd2feda9e Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev 2015-03-17 20:38:35 +00:00
Andreas Gampe
be549f9b8e Merge "Frameworks/base: Fix precedence bug" 2015-03-17 20:36:21 +00:00
Andreas Gampe
869d26fda0 Frameworks/base: Fix precedence bug 
Explicit cast has higher precedence than shift.

Bug: 19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c
 2015-03-17 20:31:22 +00:00
Andreas Gampe
0ae488e1cb Merge "Frameworks/base: Use || instead of |" 2015-03-17 20:28:53 +00:00
Andreas Gampe
e1b9262084 Frameworks/base: Use || instead of | 
Nothing wrong with | in this case, but || is canonical.

Bug: 19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
 2015-03-17 20:27:42 +00:00
Andreas Gampe
4d9076437c Merge "Frameworks/base: Fix trivial equals implementation" 2015-03-17 20:25:20 +00:00
Andreas Gampe
610b2c778c Frameworks/base: Fix trivial equals implementation 
The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.

Bug: 19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4
 2015-03-17 20:24:45 +00:00
Wale Ogunwale
ee0f4b4d0b Merge "Recompute focus stack if cleared while starting an activity." 2015-03-17 20:22:37 +00:00
Wale Ogunwale
86920fe630 Recompute focus stack if cleared while starting an activity. 
When starting an activity with Intent.FLAG_ACTIVITY_CLEAR_TOP flag,
the activity is destoried which can also cause its task to be removed
from its current stack if the activity process record is null. We now
recompute the stack for the activity task when this occurs so we
don't NPE later on.

Bug: 19552874

Change-Id: I50f51ca6dc32d4642f78d59cae93b0774bc6cdb7
 2015-03-17 13:20:24 -07:00
Brian Carlstrom
6022edc538 am 88dde1db: am d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit '88dde1db446c414bee7fb56e292be6b0ce6ac268':
  Update vmSafeMode documentation
 2015-03-17 19:51:28 +00:00
Brian Carlstrom
88dde1db44 am d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit 'd8507e3aa4c8b05f753cd9541014c391891c1f75':
  Update vmSafeMode documentation
 2015-03-17 19:44:55 +00:00
Brian Carlstrom
d8507e3aa4 am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit '83419118e3c72311ef6b900457d1b03fd5c77883':
  Update vmSafeMode documentation
 2015-03-17 19:36:19 +00:00
Brian Carlstrom
83419118e3 am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit '97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
  Update vmSafeMode documentation
 2015-03-17 19:29:20 +00:00
John Spurlock
28651d5e58 Merge "QS: 'Cast screen' -> 'Cast'." 2015-03-17 19:24:26 +00:00
Brian Carlstrom
97f3cd0a82 Merge "Update vmSafeMode documentation" into lmp-mr1-dev 2015-03-17 19:22:46 +00:00
John Spurlock
d799f70187 Merge "Audio: Flag volume adjustments from hardware keys." 2015-03-17 19:19:01 +00:00
Clara Bayarri
4d3494000c Merge "Delete the ActionModeWrapper now that it is not needed anymore." 2015-03-17 19:12:27 +00:00
Ruben Brunk
db2b5f4472 Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup" 2015-03-17 19:11:33 +00:00
Filip Gruszczynski
a483a1d85e am 81c47fc2: am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev 
* commit '81c47fc23a0a15dddf37d96d28305e8b5e5ca2da':
  Option for going home when going to sleep for devices without physical button.
 2015-03-17 19:06:58 +00:00
Wale Ogunwale
0cb1034717 Merge "Convert some log points to in AMS to use ActivityManagerDebugConfig class." 2015-03-17 19:03:00 +00:00
Wale Ogunwale
3ab9a27e3d Convert some log points to in AMS to use ActivityManagerDebugConfig class. 
Change-Id: I02154b0e1c2c64af840848fd6def054342922efa
 2015-03-17 11:53:26 -07:00