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

192551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
659e31fb29 Update documentation for short transfer counts 
Bug: 10891562
Change-Id: I6e24917a508aa29f1f6f00aa8c891ad4978dc3e6
 2015-05-18 14:11:26 -07:00
Jim Miller
dbe780f293 Attempt to fix bug with setActiveGroup() in FingerprintService. 
This attempts to fix a crash where setActiveGroup is crashing because
there's no fingerprint hardware.

Attempt to fix bug 21224390

Change-Id: Iff1c6ebb68deb6662fcb4a58248b5a562d9da2c2
 2015-05-18 13:55:00 -07:00
Zhijun He
855d5495ff Merge "Camera2: stop log spamming when closing a closed camera" into mnc-dev 2015-05-18 20:42:18 +00:00
Glenn Kasten
20a0edf123 Merge "Minor cleanup of comments and code" into mnc-dev 2015-05-18 20:38:32 +00:00
Daniel Sandler
4d19a86063 Merge "Make all icon fields & extras sent to listeners backward-compatible." into mnc-dev 2015-05-18 20:21:24 +00:00
Dan Sandler
95ba62f8d0 Merge "Remove references to nonexistant @android:string/ellipsis." into mnc-dev 2015-05-18 20:11:25 +00:00
Zhijun He
125ff3cacd Camera2: stop log spamming when closing a closed camera 
Bug: 21268174
Change-Id: I711380c52f5ce9829a660c6e1b999b0377ea6c7b
 2015-05-18 13:04:34 -07:00
Alex Klyubin
2cd7673d6e Switch from getSpi to getCurrentSpi. 
Crypto primitives' getSpi has a side-effect which modifies the state
of the primitive: it selects an SPI implementation if it hasn't been
selected yet (e.g., Cipher.getInstance("AES") doesn't select an SPI
implementation until Cipher.init). The new method getCurrentSpi has
no side-effects: it simply returns null if no SPI implementation is
selected. The switch to getCurrentSpi lets us avoid side-effects and
throw a more pertinent exception when no SPI is yet selected.

(cherry-picked from bdc1382ac575a06c98cab69117700e081c90c595)

Bug: 18088752
Change-Id: Ib369c7e988329315075aa4e18f720d86f3d96a93
 2015-05-18 12:59:43 -07:00
Riley Andrews
5ac56502e3 Make recents use immutable ashmem bitmaps for things it frequently passes across binder. 
Bug 21037890
Change-Id: Ieb29be3ff68f3db3f07df02f171325ed77915fdf
 2015-05-18 19:56:54 +00:00
Riley Andrews
b2694cc3ee Make return of screenshotApplications an ashmem immutable bitmap. 
Bug 21037890
Change-Id: I47a2ba11d26ec03a6e2e847f5af61b44efa2aa69
 2015-05-18 19:56:33 +00:00
Riley Andrews
721ae5fec5 Add internal bitmap api for creating immutable ashmem backed bitmaps. 
Bug 21037890
Change-Id: I827e83dd75e301e7d93ead5efdd744f0d8435ae5
 2015-05-18 19:55:39 +00:00
Riley Andrews
39d7f30ebe Use ashmem to optimize all bitmap copies. 
Bug 21037890
Change-Id: Ie32ca3a0c527755f1a1b77db7548cb9629e2001b
 2015-05-18 19:55:21 +00:00
Olawale Ogunwale
3edbdd845e Merge "Use the correct parent size to initialize animations" into mnc-dev 2015-05-18 19:52:39 +00:00
Paul Jensen
8845f839e3 Merge "Don't leak NetworkListens in captive portal app." into mnc-dev 2015-05-18 19:41:09 +00:00
Deepanshu Gupta
1af9913819 Merge "Fix nav bar spacing for tablets." into mnc-dev 2015-05-18 19:30:58 +00:00
Deepanshu Gupta
71dc5ee224 Fix nav bar spacing for tablets. 
Change-Id: Ieee2c2174a3041a0f967cc75bbe74d8bf882ced7
 2015-05-18 11:58:31 -07:00
Joe Fernandez
9939961db9 am 71bbd81f: am a06ac3a0: docs: M Preview Content Sync #1 
* commit '71bbd81f54f19eab99dd97f955e3de37e3f8e0a3':
  docs: M Preview Content Sync #1
 2015-05-18 18:49:31 +00:00
Luan Nguyen
babfbc2190 am 304ed716: am e14ffac6: am 193841be: Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs 
* commit '304ed7162de489cd1393b770460fe58a0ae91beb':
  docs: Add tag heuer logo to wear landing page
 2015-05-18 18:49:24 +00:00
Joe Fernandez
962b8f2b10 am 14ba009a: am 6b4c3fed: docs: Refactor Google Services pages for site redesign 
* commit '14ba009a51cede3f3f4b0ae1d1e701939e3dd1dc':
  docs: Refactor Google Services pages for site redesign
 2015-05-18 18:49:04 +00:00
Dirk Dougherty
905bc335a5 am bd5cf5de: Merge "Doc change: edits and image updates." into mnc-preview-docs 
* commit 'bd5cf5de84d802d7858371cf1f06b47c7f7b56cf':
  Doc change: edits and image updates.
 2015-05-18 18:44:23 +00:00
Dirk Dougherty
bd5cf5de84 Merge "Doc change: edits and image updates." into mnc-preview-docs 2015-05-18 18:33:17 +00:00
Dirk Dougherty
7af29cc9b9 Doc change: edits and image updates. 
Change-Id: Ic09da0c7cab676aa8ad4da9eae22e9c631fc288e
 2015-05-18 11:32:09 -07:00
Alan Viverette
5446b5f9bc Remove controlBackground attribute, replace with direct reference 
Trending on the side of fewer theme attributes. It's possible (though
somewhat painful) to set the control background without adding another
theme attribute, so leave it out. Replace with direct reference to the
themed drawable.

Bug: 21118581
Change-Id: Ica72b452495090d682842f81ca117731c3b2d874
 2015-05-18 11:30:49 -07:00
Derek Sollenberger
cdadfc211d Check that the parcel contained the expected amount of region data. 
bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
 2015-05-18 14:29:02 -04:00
Jae Seo
f03fb7f3a4 Merge "TIF: Pass the playback params as a whole" into mnc-dev 2015-05-18 18:10:31 +00:00
Jae Seo
194118f913 Merge "Make PlaybackParams parcelable" into mnc-dev 2015-05-18 18:05:34 +00:00
Jae Seo
76c4fc2977 Make PlaybackParams parcelable 
Bug: 21170699
Change-Id: I31b446e0b772bdfb65166564e48aa93cf73b74ae
 2015-05-18 17:54:47 +00:00
Rich Slogar
54f2ca6ed4 am 348d105e: am 4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs 
* commit '348d105e3590b167330356d2ae98d341d98cb18e':
  docs: build-cmd-line-updates
 2015-05-18 17:39:00 +00:00
Derek Sollenberger
beda8613ad Merge "Ensure that unparcelling Region only reads the expected number of bytes" into mnc-dev 2015-05-18 17:37:08 +00:00
Lajos Molnar
c8304e86c8 Merge "media: clarify valid values in PlaybackParams and SyncParams" into mnc-dev 2015-05-18 17:32:17 +00:00
Rich Slogar
348d105e35 am 4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs 
* commit '4e793fba568950ee2b3758e1482006661430440e':
  docs: build-cmd-line-updates
 2015-05-18 17:24:50 +00:00
Eric Laurent
68c40fafd8 Merge "AudioService: add missing audio becoming noisy intent" into mnc-dev 2015-05-18 17:20:12 +00:00
Rich Slogar
c03a39ab74 Merge "docs: emulator updates" into lmp-docs 2015-05-18 17:12:47 +00:00
Rich Slogar
4e793fba56 Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs 2015-05-18 17:12:23 +00:00
Abodunrinwa Toki
1b422a95f7 Merge "Hide the floating toolbar faster." into mnc-dev 2015-05-18 17:12:20 +00:00
Jason Monk
b6f567db95 Merge "Show data icon when appropriate." into mnc-dev 2015-05-18 17:07:32 +00:00
Paul Jensen
cee9b51c4b Query HTTP proxy for network via a new API to avoid permissions exceptions 
Add @hidden ConnectivityManager.getProxyForNetwork() API.

Bug:20470604
Change-Id: I6a9bc4afc8273bc43b14cdeccfedbbf3ff66be40
 2015-05-18 17:05:51 +00:00
Abodunrinwa Toki
8681720055 Merge "Support min/max height for FloatingToolbar overflow." into mnc-dev 2015-05-18 16:56:56 +00:00
Paul Jensen
868f6243bc Don't leak NetworkListens in captive portal app. 
Bug:21146632
Change-Id: I934044a2eec89a47185add881a74de5669cd0f89
 2015-05-18 12:48:28 -04:00
Robert Shih
40bdcb7c52 Merge "MediaPlayer: persistent track indices" into mnc-dev 2015-05-18 15:56:31 +00:00
Daniel Sandler
f5a7838e19 Make all icon fields & extras sent to listeners backward-compatible. 
For final release, we will only be doing this for
notification listeners targeting older SDKs.

Bug: 21207612
Change-Id: I28fdaa5666698150ab455f9bfb63251b9418519e
 2015-05-18 11:55:26 -04:00
Jason Monk
33f8ae7543 Show data icon when appropriate. 
Show it in the status bar when its a default network, but always show
it in QS when its connected, so that users can know its connected.

Also fix the tests.

Bug: 18776546
Change-Id: I553588fc6850b0c2ef6e6015b313222bf4c786e7
 2015-05-18 11:49:24 -04:00
Paul Jensen
700f236afb Avoid surfacing "Sign in to network" notification if user selects "use as is" 
from captive portal app.

Bug:20440795
Change-Id: I2582109008bc8659d64ead316843c15ca573b1ba
 2015-05-18 11:41:39 -04:00
Paul Jensen
d0491e9a2c Make NetworkMonitor do exponential backoff between reevaluation attempts. 
bug:19648073
Change-Id: Idbef196710f2851c4d9d39f5776dd80a2c150ddd
 2015-05-18 11:41:38 -04:00
Jason Monk
99f6977d3c Merge "Move NetworkController broadcasts/listeners to BG" into mnc-dev 2015-05-18 15:35:23 +00:00
Jason Monk
07b75fe65d Move NetworkController broadcasts/listeners to BG 
Also do some refactoring to avoid having to sets of callback interfaces
with 75% of the same data.

Bug: 19520495
Change-Id: Ife1c71174c0d6a21f924f7de3cb2f97a04c3d5a1
 2015-05-18 11:31:49 -04:00
Dan Sandler
ec20a2d6ce Remove references to nonexistant @android:string/ellipsis. 
Also remove the symbol so nobody else accidentally depends
on it. (See change I51a6cb90 for reasons.)

Bug: 21071408
Change-Id: I2f4e5fcf859772fe636cee8be385590f54836ef7
 2015-05-18 15:27:21 +00:00
John Spurlock
59c15e30af Merge "DND: Fix locale and rtl issues in QS detail panel." into mnc-dev 2015-05-18 15:19:20 +00:00
John Spurlock
814ee6ab8b DND: Fix locale and rtl issues in QS detail panel. 
Bug: 21206470
Change-Id: Id84a36bf60b56ebacdf4098d0229e8fcd66aec56
 2015-05-18 11:16:38 -04:00
Simon Baldwin
128b3c86c6 Merge "Handle load from APK correctly for shared relro" into mnc-dev 2015-05-18 14:57:22 +00:00