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

175681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Brian Carlstrom
97f3cd0a82 Merge "Update vmSafeMode documentation" into lmp-mr1-dev 2015-03-17 19:22:46 +00:00
Filip Gruszczynski
81c47fc23a am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev 
* commit '86318d768a2c5043e1261e9daacf1497d1e4a732':
  Option for going home when going to sleep for devices without physical button.
 2015-03-17 18:35:17 +00:00
Filip Gruszczynski
17413eb575 Add animation to zeroing burn in protection. 
Also don't shift immediately after starting ambient mode, but wait until
the first update.

Bug: 19521822
Change-Id: Id0b267d0f30e4533195dcfadbed726db0866e4db
 2015-03-17 11:30:12 -07:00
Filip Gruszczynski
86318d768a Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev 2015-03-17 18:29:30 +00:00
Dan Sandler
06433bd9f3 Avoid crashing on corrupted notifications. 
If a notification content view has an @id/icon or
@id/right_icon, we need to make sure those ImageViews
actually have a drawable inside.

Bug: 19487078
Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4
 2015-03-17 16:34:34 +00:00
Deepanshu Gupta
199a70f182 am 576801ff: am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '576801ff82a85c4de19404dfe364eef7184b84e0':
  Fix AppCompat action bar theming.
 2015-03-17 14:44:52 +00:00
Deepanshu Gupta
0f8c9d1df2 am a5be9a7d: am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit 'a5be9a7d2d2cbcd3892fc916c9a944745024881d':
  Fix NoActionBar themes rendering.
 2015-03-17 14:44:46 +00:00
Mathieu Chartier
5ec7c78d52 am 008ec61e: Merge "Change jit properties to be debug properties" 
* commit '008ec61e0ccff0ca92cc0d2b5b73a1d620d3aad3':
  Change jit properties to be debug properties
 2015-03-17 14:36:50 +00:00
Deepanshu Gupta
576801ff82 am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '842eee9f816a2e35bf3c9ce6c14cd5e43684265b':
  Fix AppCompat action bar theming.
 2015-03-17 14:36:05 +00:00
Deepanshu Gupta
a5be9a7d2d am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '38467b5fbbc09ad05624454f735d27ada25565c8':
  Fix NoActionBar themes rendering.
 2015-03-17 14:35:58 +00:00
Deepanshu Gupta
842eee9f81 am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '1f9a26af95abba385b612c734d1d5e32d9e3f363':
  Fix AppCompat action bar theming.
 2015-03-17 14:28:37 +00:00
Deepanshu Gupta
38467b5fbb am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
  Fix NoActionBar themes rendering.
 2015-03-17 14:28:33 +00:00
Deepanshu Gupta
1f9a26af95 am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
  Fix AppCompat action bar theming.
 2015-03-17 14:16:50 +00:00
Deepanshu Gupta
9a00f1c84b am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
  Fix NoActionBar themes rendering.
 2015-03-17 14:16:42 +00:00
Mathieu Chartier
008ec61e0c Merge "Change jit properties to be debug properties" 2015-03-17 02:04:34 +00:00
Andreas Gampe
14e436aec4 am 345a8f69: Merge "Frameworks/base: Fix a comparison" 
* commit '345a8f69ea2acd6d3ecf4c200cb33e8037f8798c':
  Frameworks/base: Fix a comparison
 2015-03-17 00:25:04 +00:00
Deepanshu Gupta
158c08bcf1 am ada85905: Fix AppCompat action bar theming. 
* commit 'ada8590547348b77d8cbd56abdb8fadb3e72c015':
  Fix AppCompat action bar theming.
 2015-03-17 00:21:02 +00:00
Deepanshu Gupta
79f7fce7a4 am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '2e4d93245764a1c1d7515361ddbb8fc1665f814e':
  Fix NoActionBar themes rendering.
 2015-03-17 00:20:58 +00:00
Andreas Gampe
345a8f69ea Merge "Frameworks/base: Fix a comparison" 2015-03-17 00:12:25 +00:00
Mathieu Chartier
1ad10ef1e4 Change jit properties to be debug properties 
Bug: 19735273
Change-Id: I266cf447a7af0595366bf89109d2823094f5cf41
 2015-03-16 16:22:52 -07:00
Yang Ni
cc1ca488e2 Added copyright notice and formatted to convention 
Pure format change. No other changes at all.

Change-Id: I74a53aa67ef0960f70becaf288b85be40066a0ae
 2015-03-16 15:53:18 -07:00
Quddus Chong
180b835480 docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785. 
Change-Id: Iea6a787896d22ec29702fc7370d9ad702af051b7
 2015-03-16 15:48:18 -07:00
Luan Nguyen
8662c04fd7 docs: Add distribution guidelines and update quality checklist 
for Android Auto.

Change-Id: Ie504fee6ee32fd24d332ff65004a6b711e7fe3ec
 2015-03-16 13:54:51 -07:00
Andreas Gampe
7f95a1bc32 am 5eb42122: Merge "Frameworks/base: Force long computation" 
* commit '5eb421221bcade4f5715d42843346f7d3c733547':
  Frameworks/base: Force long computation
 2015-03-16 20:49:12 +00:00
Andreas Gampe
5eb421221b Merge "Frameworks/base: Force long computation" 2015-03-16 20:37:02 +00:00
Andreas Gampe
e685753136 am f3e581c9: Merge "Frameworks/base: Check before foreach in Script" 
* commit 'f3e581c99f33ae1857fa52b11cf9bfbfe400c553':
  Frameworks/base: Check before foreach in Script
 2015-03-16 19:31:17 +00:00
Andreas Gampe
c3228a9d40 am 3d33314e: Merge "Frameworks/base: Use equals for Integer comparison" 
* commit '3d33314e03c24758e3b3bbd9e23e40199a259b80':
  Frameworks/base: Use equals for Integer comparison
 2015-03-16 19:22:00 +00:00
Andreas Gampe
f3e581c99f Merge "Frameworks/base: Check before foreach in Script" 2015-03-16 19:17:45 +00:00
Andreas Gampe
3d33314e03 Merge "Frameworks/base: Use equals for Integer comparison" 2015-03-16 19:10:40 +00:00
Deepanshu Gupta
ada8590547 Fix AppCompat action bar theming. 
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.

 - Set project callback when LayoutInflater is created by
   LayoutInflater.from(context).
 - Remove duplication of code to get base context from context wrapper.

Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
 2015-03-16 11:45:00 -07:00