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

113532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
0bab400b38 am 53b2a957: am 8ea8ff81: am 78ec732f: Doc change: Update Google Play Services reference docs. 
* commit '53b2a957d19f21cd377d5f93225820d63c6b51d9':
  Doc change: Update Google Play Services reference docs.
 2013-09-20 11:51:37 -07:00
Dirk Dougherty
53b2a957d1 am 8ea8ff81: am 78ec732f: Doc change: Update Google Play Services reference docs. 
* commit '8ea8ff81a93f367af59e328bb365ca9560e264ec':
  Doc change: Update Google Play Services reference docs.
 2013-09-20 11:48:52 -07:00
Dirk Dougherty
8ea8ff81a9 am 78ec732f: Doc change: Update Google Play Services reference docs. 
* commit '78ec732f73aedc6afd79c4f924345a5adb61dc54':
  Doc change: Update Google Play Services reference docs.
 2013-09-20 11:46:23 -07:00
David Christie
a31510e47a Clear names from externally supplied WorkSources to WifiManager (b/10733757) 
Change-Id: I36102f13962df2093c1e35fb40081ead647eff32
 2013-09-20 11:41:41 -07:00
Martin Kosiba
0d147d9b89 Update WebView documentation section about zoom. 
This makes it clear that pinch-zoom and wrap_content don't go well
together.

BUG: 10598456
Change-Id: I748b454197353fcbe5c2621719934a121745d4ce
 2013-09-20 11:33:42 -07:00
Dirk Dougherty
78ec732f73 Doc change: Update Google Play Services reference docs. 
Change-Id: Iaed2e01a18263000509f243e66a6b6b33037d6b9
 2013-09-20 11:30:46 -07:00
Dianne Hackborn
2d696ff910 am 76e6bcb8: Merge "Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest" into klp-dev 
* commit '76e6bcb8c6f8804c6e32d359ee464e7f288291a4':
  Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
 2013-09-20 11:24:52 -07:00
Chet Haase
6736d380b7 am bdb61865: Merge "Add equals() and hashcode() to SpannableString" into klp-dev 
* commit 'bdb6186580875982dd1a537b6c935922d0e62fe3':
  Add equals() and hashcode() to SpannableString
 2013-09-20 11:24:49 -07:00
Adam Lesinski
2dc3c7398b am ff5cbab5: Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev 
* commit 'ff5cbab50076baa06333b6ee05cc04c882a7ba13':
  Ensures that CompatibilityInfo is always set in Resources
 2013-09-20 11:24:46 -07:00
Matthew Williams
ed37b93af8 fix deadlock caused by clearAllBackoffs in SSE 
ordering of locks in SyncStorageEngine#clearAllBackoffs()
introduced deadlocks.
Bug: 10751759
Bug: 10680330
Change-Id: Ief118830b6b249de0e7618b6186b4181b4f12f82
 2013-09-20 18:24:30 +00:00
Dianne Hackborn
76e6bcb8c6 Merge "Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest" into klp-dev 2013-09-20 18:23:08 +00:00
Chet Haase
bdb6186580 Merge "Add equals() and hashcode() to SpannableString" into klp-dev 2013-09-20 18:22:54 +00:00
Adam Lesinski
ff5cbab500 Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev 2013-09-20 18:22:17 +00:00
Glenn Kasten
f69cd6787d Revert "Workaround for slow AudioRecord destructor" 
This reverts commit 8d87d7ba113ad90685f1d2669e65251a9b422a5a.

Change-Id: I78cbe73959d29fc0ff3153268503ae685cd0995c
 2013-09-20 18:10:28 +00:00
Adam Lesinski
79a8ffe54f Ensures that CompatibilityInfo is always set in Resources 
- Adds null checks when setting mCompatibilityInfo and uses default no-op
  CompatibilityInfo object instead of null
- Removes null checks when calling methods on mCompatibilityInfo since it is never
  null

bug:10204942

Change-Id: I36e88f5cdceb46b8b19fb902270ef74023a81546
 2013-09-20 11:04:40 -07:00
Robert Greenwalt
032de6c629 am c237c204: Merge "Supsend/resume batched scans around dhcp." into klp-dev 
* commit 'c237c20441df671a4c596138976f15e40aa95cf3':
  Supsend/resume batched scans around dhcp.
 2013-09-20 11:00:58 -07:00
Robert Greenwalt
c237c20441 Merge "Supsend/resume batched scans around dhcp." into klp-dev 2013-09-20 17:55:44 +00:00
Dianne Hackborn
a2067473e8 Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest 
Change-Id: Id6432fc1b62db41c6c291ec08450c2fc37ced899
 2013-09-20 10:54:16 -07:00
Robert Greenwalt
eccc0905bd am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev 
* commit '540784f903c8a9e808ef88d14fe5e1227bda4561':
  Cleanup the shutdown of BatchedScans.
 2013-09-20 10:50:39 -07:00
Robert Greenwalt
540784f903 Merge "Cleanup the shutdown of BatchedScans." into klp-dev 2013-09-20 17:43:30 +00:00
Svetoslav
b206f1271d Null not handled when parsing media size resource id attribute. 
bug:10835715

Change-Id: I0c9c1120c26e68b4c582599bbda3753d0e443d8c
 2013-09-20 10:43:29 -07:00
Robert Greenwalt
81fec6be04 Supsend/resume batched scans around dhcp. 
Scanning while dhcp is running breaks dhcp, so stop the batched scans
when we need dhcp and start it up again after.

bug:10691401
Change-Id: Ifdeb6f35cfe4509b90fed1e1e694d0c107f24a7e
 2013-09-20 10:13:46 -07:00
Scott Main
81c494b680 am 562ce888: am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '562ce888af21fc18d1610545ff6373ee2ecbbb13':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:12:53 -07:00
Vinit Deshapnde
0fd3b1be14 Fix incorrect exception being thrown from WifiConfiguration 
Bug: 10817189

Change-Id: Ib2985f50080cb9d983a6de6ce668223e8782c3b6
 2013-09-20 10:12:30 -07:00
Scott Main
562ce888af am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '8f6ed205a2523a8170cdd3e824170fd77c4fd65a':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:10:22 -07:00
Scott Main
8f6ed205a2 am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '208e6079b4ccd161de198553319d285711564ea2':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:07:46 -07:00
Scott Main
208e6079b4 am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '0333302ad7162f66404c08e1c6c5b6b767aa78b3':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:04:26 -07:00
Scott Main
0333302ad7 Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 2013-09-20 16:58:39 +00:00
Robert Greenwalt
82f4218c0d Cleanup the shutdown of BatchedScans. 
Fixes binder-death as well as disambiguation when an app has multiple requests in.

bug:10641931
Change-Id: Ib701d531fa51e7e2a027848cfdfcad3b47056923
 2013-09-20 16:32:47 +00:00
John Spurlock
d4c2b67ea6 am 560d2e46: Merge "Include starting windows in the sysui vis calculation." into klp-dev 
* commit '560d2e463ed282badd1d069d60d98b59af3b880f':
  Include starting windows in the sysui vis calculation.
 2013-09-20 09:27:59 -07:00
John Spurlock
560d2e463e Merge "Include starting windows in the sysui vis calculation." into klp-dev 2013-09-20 16:25:30 +00:00
Scott Main
9bcea321af add custom head tag to verify developers@android.com as site owner 
Change-Id: I1a79669ab1e30de152354fafe5e397d5d1598f15
 2013-09-20 09:10:08 -07:00
John Spurlock
79da83347a Include starting windows in the sysui vis calculation. 
Sysui vis needs to be recomputed in the same code path as showing/
hiding the system bar (code path = finishPostLayoutPolicyLw) so
it can perform the new fade in/fade out to transparent modes at
the correct time.

Turns out no new state tracking is required, we already keep track
of this window as mTopFullscreenOpaqueWindowState.

So prefer mFocusedWindow when computing sysui vis as before,
but if null fallback to mTopFullscreenOpaqueWindowState.

Bug:10561554
Change-Id: I492766989a67fdac4f030451dcf00f6741a556c0
 2013-09-20 12:04:47 -04:00
Maggie Benthall
b0bd2bfdbc am db93e1d7: Merge "UX compliance for CA Cert warning tile in QuickSettings" into klp-dev 
* commit 'db93e1d79eca52c7ab27b148f55dc0a5a0c771a1':
  UX compliance for CA Cert warning tile in QuickSettings
 2013-09-20 07:34:52 -07:00
Maggie Benthall
db93e1d79e Merge "UX compliance for CA Cert warning tile in QuickSettings" into klp-dev 2013-09-20 14:30:29 +00:00
Daniel Sandler
0cc9298320 am 4e6f752f: Put soundpooled sounds in the right place. 
* commit '4e6f752f237ac5c3d96d45d1fc60ec66e10ad63e':
  Put soundpooled sounds in the right place.
 2013-09-20 05:18:41 -07:00
Daniel Sandler
4e6f752f23 Put soundpooled sounds in the right place. 
Bug: 10846839
Change-Id: I5318c2d54ea0e25fa74bbafc35fb4f7a2883b351
 2013-09-20 00:27:01 -04:00
Jim Miller
aef8902245 am 3855b99f: Fix the build - replace broken assets. 
* commit '3855b99ff088abe5c25b35e0dc000644eb2d5fcb':
  Fix the build - replace broken assets.
 2013-09-19 20:06:56 -07:00
Jim Miller
3855b99ff0 Fix the build - replace broken assets. 
Change-Id: If039dee6d7e663d6abacd5239557d4d0a07fc912
 2013-09-19 20:01:56 -07:00
Jeff Sharkey
89dec7e6e9 am a9ce049d: Load RootInfo in background, invalidation. 
* commit 'a9ce049db87259e302e2368d2a4a1c11a94fd831':
  Load RootInfo in background, invalidation.
 2013-09-19 19:59:22 -07:00
Jeff Sharkey
a9ce049db8 Load RootInfo in background, invalidation. 
Move all RootInfo queries to background threads to avoid janking
the UI.  Update passes happen on spawed task, which swaps out updated
cache results when finished.  Support partial updates when only a
single package/authority has changed.  Watch for change notifications
for roots, since flags can change over time.

Ignore stopped packages when in background, but query them for roots
when launching any picker UI.

Optimize management launches by treating as one-shot requests that
don't need to wait for all RootInfo.

Bug: 10600454, 10745490
Change-Id: Ibc7b15688ef6b41bd7e9dd0d7564b501e60e49a9
 2013-09-19 19:53:32 -07:00
Michael Jurka
48c52bea8b am bdac73fe: Merge "Fix default wallpaper dimensions" into klp-dev 
* commit 'bdac73fec8e6d4686398654f7a74db465e6de8e0':
  Fix default wallpaper dimensions
 2013-09-19 19:36:16 -07:00
Michael Jurka
bdac73fec8 Merge "Fix default wallpaper dimensions" into klp-dev 2013-09-20 02:33:47 +00:00
Michael Jurka
8b4836085b Fix default wallpaper dimensions 
Bug: 10834711
 2013-09-20 04:32:20 +02:00
Christopher Tate
2e6eef655f am 3301f76b: Merge "Don\'t back up apps in the \'stopped\' state" into klp-dev 
* commit '3301f76b2317d2ee2d72e2cdd396e29be63fd414':
  Don't back up apps in the 'stopped' state
 2013-09-19 19:21:11 -07:00
Christopher Tate
3301f76b23 Merge "Don't back up apps in the 'stopped' state" into klp-dev 2013-09-20 02:16:10 +00:00
Igor Murashkin
5c9eaf6796 camera2: Add more camera device states, make #openCamera async. 
* Move CAMERA_IN_USE, MAX_CAMERAS_IN_USE to StateListener#onError
* Copy CAMERA_DISABLED to StateListener#onError

Bug: 10360518
Change-Id: Idd8cf42e1511d12682018588b2b413116cf65116
 2013-09-19 19:01:32 -07:00
Jim Miller
f3d1ef00c5 am af638c4f: Merge "Add camera affordance to navigation bar on phones" into klp-dev 
* commit 'af638c4f9daa74b4c8e0905f07e11290f6845abe':
  Add camera affordance to navigation bar on phones
 2013-09-19 18:36:57 -07:00
Jim Miller
af638c4f9d Merge "Add camera affordance to navigation bar on phones" into klp-dev 2013-09-20 01:33:28 +00:00
Svetoslav Ganov
22cb9170d3 Update android.print.PrintAttributes documentation 
bug:10550844

Change-Id: Ic1bbb2cb6ab55826eb66242f6002b7165aff37a4

Conflicts:
	core/java/android/print/PrintAttributes.java
 2013-09-19 18:31:48 -07:00