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

114568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
f045a893ca am dd47d78a: am 543de874: Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev 
* commit 'dd47d78a5e2b8d6f383e79fd4531fd38403d5614':
  Revert "Workaround for slow AudioRecord destructor"
 2013-09-20 15:44:21 -07:00
Glenn Kasten
dd47d78a5e am 543de874: Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev 
* commit '543de8746e1c238f81a863f687d258ad86f5ef95':
  Revert "Workaround for slow AudioRecord destructor"
 2013-09-20 15:41:00 -07:00
Glenn Kasten
543de8746e Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev 2013-09-20 22:38:19 +00:00
Craig Mautner
7538f8ba02 am 83103184: am 04476691: Merge "Remove over-aggressive stack movement." into klp-dev 
* commit '83103184be048580673c8e2c3358f6bdd4cfd205':
  Remove over-aggressive stack movement.
 2013-09-20 14:34:49 -07:00
Craig Mautner
83103184be am 04476691: Merge "Remove over-aggressive stack movement." into klp-dev 
* commit '04476691424811f5029194410519f49f913b672d':
  Remove over-aggressive stack movement.
 2013-09-20 14:31:25 -07:00
Craig Mautner
0447669142 Merge "Remove over-aggressive stack movement." into klp-dev 2013-09-20 21:28:14 +00:00
Svetoslav
2acb4e477d am 95aa013f: am 27de674c: Merge "PrintDocumentAdapter contract not followed on print." into klp-dev 
* commit '95aa013f126662c3e1cc2e64f523d611d62e486c':
  PrintDocumentAdapter contract not followed on print.
 2013-09-20 14:18:23 -07:00
Svetoslav
95aa013f12 am 27de674c: Merge "PrintDocumentAdapter contract not followed on print." into klp-dev 
* commit '27de674c698a82c0195ee1d60ab1d629a5201297':
  PrintDocumentAdapter contract not followed on print.
 2013-09-20 14:15:05 -07:00
Svetoslav
27de674c69 Merge "PrintDocumentAdapter contract not followed on print." into klp-dev 2013-09-20 21:12:54 +00:00
Craig Mautner
8916aadd1e Remove over-aggressive stack movement. 
Moving a task to the bottom was also moving its stack to the back.
Since chrome always finishes by calling moveTaskToBack this put
the home stack in front of the application stack and would cause
bizarre window layering effects.

Definitely fixes 10764463.
Maybe fixes 10678010.

Change-Id: Ic202ae4fad44b36a8444255764d2135fccd4743d
 2013-09-20 13:42:49 -07:00
David Christie
2875fb8586 am 0e500803: am f31a7897: Merge "Clear names from externally supplied WorkSources to WifiManager (b/10733757)" into klp-dev 
* commit '0e50080395d2ed9e3c703f769ea3fb84706f989a':
  Clear names from externally supplied WorkSources to WifiManager (b/10733757)
 2013-09-20 13:13:54 -07:00
David Christie
0e50080395 am f31a7897: Merge "Clear names from externally supplied WorkSources to WifiManager (b/10733757)" into klp-dev 
* commit 'f31a78977401b155c0781dfe7d7cb6b7b38543c0':
  Clear names from externally supplied WorkSources to WifiManager (b/10733757)
 2013-09-20 13:06:49 -07:00
David Christie
f31a789774 Merge "Clear names from externally supplied WorkSources to WifiManager (b/10733757)" into klp-dev 2013-09-20 20:04:04 +00:00
Nick Kralevich
69527ad1de am ac219aa5: am 662b3bbe: am effefbc4: Merge "Proper security labeling of multi-user data directories." 
* commit 'ac219aa5a3249fb0797a8bca474794b7a81b5ce0':
  Proper security labeling of multi-user data directories.
 2013-09-20 12:56:40 -07:00
Nick Kralevich
ac219aa5a3 am 662b3bbe: am effefbc4: Merge "Proper security labeling of multi-user data directories." 
* commit '662b3bbe08c03de77c0676b4fdc1587723863f1b':
  Proper security labeling of multi-user data directories.
 2013-09-20 12:51:47 -07:00
Nick Kralevich
662b3bbe08 am effefbc4: Merge "Proper security labeling of multi-user data directories." 
* commit 'effefbc48f41fa484910e66c78a79a34817c345b':
  Proper security labeling of multi-user data directories.
 2013-09-20 12:38:52 -07:00
Nick Kralevich
effefbc48f Merge "Proper security labeling of multi-user data directories." 2013-09-20 19:35:17 +00:00
Vinit Deshapnde
ce34f22b69 am 27271f67: am a5fb1204: Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev 
* commit '27271f673546faa973d7a24c594da626ebdbd337':
  Fix incorrect exception being thrown from WifiConfiguration
 2013-09-20 12:34:58 -07:00
Vinit Deshapnde
27271f6735 am a5fb1204: Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev 
* commit 'a5fb1204385be2ab58bb4b653fbffae4f365b98c':
  Fix incorrect exception being thrown from WifiConfiguration
 2013-09-20 12:32:22 -07:00
Vinit Deshapnde
a5fb120438 Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev 2013-09-20 19:30:26 +00:00
Svetoslav
5559c368a9 PrintDocumentAdapter contract not followed on print. 
1. Layout was not called after pressing the print button if the
   print attributes did not change. This is not correct since the
   previous layout calls were for preview purposes and the one
   after pressing print is not for preview. Hence, we always have
   to do this layout.

2. After layout we decide whether to ask the app to write some
   pages. We ask for a write if we do not have the pages selected
   by the user or the document changed (if the page count changed,
   the document type changed, or the app told us that the content
   changed). We were not computing correctly whether the document
   changed since we compared the size but the document info the
   app passes in after a layout does not have the size yet. We set
   the size after a write. So for layout purposes we should ignore
   the size. We only care if the page count, document type, or
   content changed where the latter is reported by the app in
   the layout callback.

3. We were not updating the PrintJob after setting the data
   size of the printed document.

4. Disabled debugging.

bug:10835370

Change-Id: Ic3b2871b4e954cdf610f8cf806de5fc6588a6bec
 2013-09-20 12:15:22 -07:00
Svetoslav
3df66d2758 am a7055b01: am 5006eb75: Merge "Null not handled when parsing media size resource id attribute." into klp-dev 
* commit 'a7055b01ec6d9931e4eb06b8a9fd76e5a9e165da':
  Null not handled when parsing media size resource id attribute.
 2013-09-20 12:04:41 -07:00
Svetoslav
a7055b01ec am 5006eb75: Merge "Null not handled when parsing media size resource id attribute." into klp-dev 
* commit '5006eb75e6d42ac107734fa8134a726158d768d8':
  Null not handled when parsing media size resource id attribute.
 2013-09-20 12:02:12 -07:00
Svetoslav
5006eb75e6 Merge "Null not handled when parsing media size resource id attribute." into klp-dev 2013-09-20 18:59:39 +00:00
Dirk Dougherty
5039a12868 am f203a625: am 0bab400b: am 53b2a957: am 8ea8ff81: am 78ec732f: Doc change: Update Google Play Services reference docs. 
* commit 'f203a6253776fdea3c7b094251ac3f284a35af19':
  Doc change: Update Google Play Services reference docs.
 2013-09-20 11:57:51 -07:00
Dirk Dougherty
f203a62537 am 0bab400b: am 53b2a957: am 8ea8ff81: am 78ec732f: Doc change: Update Google Play Services reference docs. 
* commit '0bab400b3819c1ca61c9d1275d5f511aee222f70':
  Doc change: Update Google Play Services reference docs.
 2013-09-20 11:54:22 -07:00
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
Dirk Dougherty
78ec732f73 Doc change: Update Google Play Services reference docs. 
Change-Id: Iaed2e01a18263000509f243e66a6b6b33037d6b9
 2013-09-20 11:30:46 -07:00
Dianne Hackborn
af7968497e am 2d696ff9: am 76e6bcb8: Merge "Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest" into klp-dev 
* commit '2d696ff910479457b0f01421c93f2f8516f64b13':
  Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
 2013-09-20 11:29:19 -07:00
Chet Haase
d0bcf4b76b am 6736d380: am bdb61865: Merge "Add equals() and hashcode() to SpannableString" into klp-dev 
* commit '6736d380b7d318f3af84294ae38a881e2dc54528':
  Add equals() and hashcode() to SpannableString
 2013-09-20 11:29:16 -07:00
Adam Lesinski
e6ed04a7ec am 2dc3c739: am ff5cbab5: Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev 
* commit '2dc3c7398b2d8965f8017bc25f2e9a29c6b83c3d':
  Ensures that CompatibilityInfo is always set in Resources
 2013-09-20 11:29:12 -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
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
Robert Greenwalt
12f6510170 am 032de6c6: am c237c204: Merge "Supsend/resume batched scans around dhcp." into klp-dev 
* commit '032de6c6294893045c0c17946b45800b5af47d60':
  Supsend/resume batched scans around dhcp.
 2013-09-20 11:22:40 -07:00
Robert Greenwalt
692af53a20 am eccc0905: am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev 
* commit 'eccc0905bd150a334a98efedfb08570bcdd1c31a':
  Cleanup the shutdown of BatchedScans.
 2013-09-20 11:22:35 -07:00
Scott Main
0216929e19 am 81c494b6: 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 '81c494b68046dbee464c7cc703595ecdb685723f':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 11:22:23 -07:00
Adam Lesinski
ff5cbab500 Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev 2013-09-20 18:22:17 +00:00
John Spurlock
812632b95b am d4c2b67e: am 560d2e46: Merge "Include starting windows in the sysui vis calculation." into klp-dev 
* commit 'd4c2b67ea6b084b8242ad2aa054c749e1f26d13b':
  Include starting windows in the sysui vis calculation.
 2013-09-20 11:22:10 -07:00
Maggie Benthall
ca4ffc599e am b0bd2bfd: am db93e1d7: Merge "UX compliance for CA Cert warning tile in QuickSettings" into klp-dev 
* commit 'b0bd2bfdbc878d4f23e3277704e3c9a82b112381':
  UX compliance for CA Cert warning tile in QuickSettings
 2013-09-20 11:22:00 -07:00
Daniel Sandler
806fa829b4 am 0cc92983: am 4e6f752f: Put soundpooled sounds in the right place. 
* commit '0cc9298320fa6f018f0a2b7292057be46964c15c':
  Put soundpooled sounds in the right place.
 2013-09-20 11:21:56 -07:00
Jim Miller
bbfd7e3ca2 am aef89022: am 3855b99f: Fix the build - replace broken assets. 
* commit 'aef8902245bdde18a3bd168e8706cd1e009f4d24':
  Fix the build - replace broken assets.
 2013-09-20 11:21:29 -07:00
Jeff Sharkey
f97d4681d3 am 89dec7e6: am a9ce049d: Load RootInfo in background, invalidation. 
* commit '89dec7e6e9ab98141de89096ef052cb2c158c557':
  Load RootInfo in background, invalidation.
 2013-09-20 11:21:26 -07:00
Michael Jurka
20ce157923 am 48c52bea: am bdac73fe: Merge "Fix default wallpaper dimensions" into klp-dev 
* commit '48c52bea8b8b53e9e7d5e0db409a0ada8bd90d0d':
  Fix default wallpaper dimensions
 2013-09-20 11:21:23 -07:00
Christopher Tate
cc5db25485 am 2e6eef65: am 3301f76b: Merge "Don\'t back up apps in the \'stopped\' state" into klp-dev 
* commit '2e6eef655f079536251ff030d38fb6480dd97a18':
  Don't back up apps in the 'stopped' state
 2013-09-20 11:21:18 -07:00