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

113704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshapnde
2871588101 Allow yet another combination of key management options 
Framework sets allowedKeyManagement to WPA_EAP + WPA_PSK, if
WifiConfiguration didn't supply any value for it. It should probably
change to NONE; but that is post K thing. I am allowing that
combination for now.

Bug: 10843500
Change-Id: Id0c28f4aaf32c6a7e7dca07114a2452ce194a798
 2013-09-20 15:21:33 -07:00
destradaa
7f02eb2c84 Ensure access to the map of geofence callbacks is synchronized in all cases 
Fix Java reference leak in the JNI layer

Bug: 10624887
Change-Id: I656973653d82c73a7ba2b51f22989ffed144c5df
 2013-09-20 15:19:00 -07:00
Adam Lesinski
eb8c3f93ed Surfaces ParcelFileDescriptor#parseMode() as API 
Moves ContentResolver#modeToMode() to ParcelFileDescriptor#parseMode()

bug:10711271
Change-Id: I28a5de4ca70adfbec4caf739863b77f0fd7fd9a4
 2013-09-20 14:59:34 -07:00
Jeff Sharkey
2d8b4e8013 Delegate mkdirs() to vold when lacking perms. 
Apps without sdcard_r or sdcard_rw are still able to write to
their package-specific directory, but someone needs to first make
that directory on their behalf.  This change will delegate the
mkdirs() call through to vold when an app fails to create directly.

MountService validates that the path belongs to the calling user, and
that it's actually on external storage, before passing to vold.

Update Environment to make app-vs-vold paths clearer.

Bug: 10577808
Change-Id: I43b4a77fd6d2b9af2a0d899790da8d9d89386776
 2013-09-20 14:34:02 -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
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
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
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
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
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
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
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