113439 Commits

Author SHA1 Message Date
Svetoslav Ganov
18e3ca0f14 am 678e907e: Merge "Update android.print.PrintAttributes documentation" into klp-dev
* commit '678e907e09388dff8b2955bb524c2706f067a6ef':
  Update android.print.PrintAttributes documentation
2013-09-20 19:44:03 -07:00
Svetoslav Ganov
678e907e09 Merge "Update android.print.PrintAttributes documentation" into klp-dev 2013-09-21 02:39:59 +00:00
David Friedman
7cc82d9f16 am ad533927: am 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs
* commit 'ad5339274cf5137aa3b28fd8de6fa1d305b58def':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:
2013-09-20 19:13:22 -07:00
David Friedman
ad5339274c am 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs
* commit '224234461cd7752a179ad631d9c8c3cdb3964898':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:
2013-09-20 19:11:45 -07:00
David Friedman
224234461c am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs
* commit '217683d95d0be42c738b2844b289f2207e36b70f':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:
2013-09-20 19:09:17 -07:00
David Friedman
217683d95d am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs
* commit 'e12437284fcf94aed4ac5c2e10401b70fb1be086':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:
2013-09-20 19:05:55 -07:00
David Friedman
e12437284f Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs 2013-09-21 02:02:45 +00:00
Igor Murashkin
6bbf9dc5ae camera2: Add capture sequences and capture failures
- CaptureResult#getRequest is used to tie a result to a request (for convenience)
- Add new CaptureFailure class to describe capture failure
- Results/frame numbers also return frame numbers, sequence ids
- Captures now all return the sequence id
- A sequence id onComplete is available in the CaptureListener

Bug: 10360518
Change-Id: I9ebaa45698c718a1185b5ae920b7975925fe2f60
2013-09-20 19:00:50 -07:00
Dianne Hackborn
cc585f86bc am 88b6e69b: Merge "Fix issue #10863270: procstats UI is showing all green" into klp-dev
* commit '88b6e69bc7007964f9ae4f30faf1bb59d6a702bb':
  Fix issue #10863270: procstats UI is showing all green
2013-09-20 18:53:37 -07:00
Dianne Hackborn
88b6e69bc7 Merge "Fix issue #10863270: procstats UI is showing all green" into klp-dev 2013-09-21 01:52:04 +00:00
Dianne Hackborn
2610b7cb2a Fix issue #10863270: procstats UI is showing all green
Gah I messed up when refactoring so it would always be told
RAM is low.

Also slightly tune the low memory parameters to go into low
memory states a bit more aggressively.

Change-Id: I5f970349760ad349d515a85c266ab21b387ee353
2013-09-20 18:51:03 -07:00
David Friedman
5f1755961b Fixed typo: Added missing word.
Bug 10617080
Fixed typo:

"Determine if AccountManager for You"
-->
"Determine if AccountManager is for You"

Change-Id: I5b8f1368dad72bbbeb581132f480baf46a029be8
2013-09-20 18:33:30 -07:00
Dianne Hackborn
ff7f43eb08 am bb6fd7ff: Merge "Shut. Up." into klp-dev
* commit 'bb6fd7ff8cec893999b26e39dc62f1b4b4b9a8ea':
  Shut.  Up.
2013-09-20 18:29:16 -07:00
Dianne Hackborn
28db9c6417 am 90d51b1a: Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev
* commit '90d51b1abe64442927c7e6bdbafc99f41a55f393':
  Fix issue #10807048:  Groupon: The application crash when user rotates...
2013-09-20 18:25:44 -07:00
Dianne Hackborn
bb6fd7ff8c Merge "Shut. Up." into klp-dev 2013-09-21 01:25:18 +00:00
Dianne Hackborn
90d51b1abe Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev 2013-09-21 01:21:26 +00:00
Dianne Hackborn
c30d92e224 Shut. Up.
Change-Id: Id047ab2308903a527bebf80bdacdb01ec51de051
2013-09-20 18:19:00 -07:00
Svetoslav
939d95924a am b39ce63d: Merge "Offer to enable a print service after it is installed." into klp-dev
* commit 'b39ce63d2807c9d5c68d3be052dee7e9da7ec3be':
  Offer to enable a print service after it is installed.
2013-09-20 18:18:36 -07:00
Svetoslav
b39ce63d28 Merge "Offer to enable a print service after it is installed." into klp-dev 2013-09-21 01:15:47 +00:00
Dianne Hackborn
e784d1e4cf Fix issue #10807048: Groupon: The application crash when user rotates...
...device to another mode (portrait or landscape) on Main page.

So, it turns out that Bundle claimed to have an invariant that either
mParcelledData or mMap would hold its data, never both.  The new
implementation on top of ArrayMap assumed this was the case.  However,
there is one situation where it is not true: an application can take
an existing Bundle that contains data, and call readFromParcel() on it.
The implementation of readFromParcel() would just pull out the
parceled data and stuff it in to mParcelledData for later unparceling,
even if that Bundle already had a non-empty mMap.

To fix this, we just look for this case in readFromParcel() and
immediately unparcel at that point into the existing map, using a
new unparcelling method that doesn't rely on the target map being
empty.

Change-Id: Ib816b6876a6cd2760b7a3372c7a79ca2f12dfeba
2013-09-20 18:13:52 -07:00
Ken Sumrall
fefefbb175 Upload fsck logs to the dropbox when error found
If fsck made changes to the filesystem, then upload
the logs to the dropbox.  We can then get them into
Android Problem Reports.

Bug: 10021342

Change-Id: I202d2b2ba4060a2f379ca78f1b3f2c7a3f5796e0
2013-09-20 17:48:15 -07:00
Svetoslav
d8f391b4e0 Offer to enable a print service after it is installed.
The user has to explicitly enable a print service from the settings UI
before using it. Usually, users very rarely if at all interact with print
services, therefore all print service management task are performed from
the print settings. We also have to get user consent warning that the
user's data is about to be given to a third-party app. We now post a
notification allowing the user to go directly to the settings screen to
turn the service on.

bug:10447510

Change-Id: Iea56c0825f0bf38328ad94912f0ea5576e9339b3
2013-09-20 17:40:25 -07:00
Chris Craik
bd842f96ed am d8a84a86: Merge "Correct bitmap merging logic" into klp-dev
* commit 'd8a84a8609951826135a2e41a1cdd6b7cf680e27':
  Correct bitmap merging logic
2013-09-20 17:34:58 -07:00
Chris Craik
d8a84a8609 Merge "Correct bitmap merging logic" into klp-dev 2013-09-21 00:33:36 +00:00
Chris Craik
996fe65634 Correct bitmap merging logic
bug:10863163

This fixes two issues

The check for pure translation was incorrect. It was fixed and renamed
for clarity.

Certain matrix paths weren't setting kTypePositiveScale. For
simplicity (and because positive scale is simple to check) removed
flag in favor of dynamic checking.

Change-Id: Ic5ce235653ef49a68b8b242bd89fc2e95874ecc9
2013-09-20 17:25:31 -07:00
Raph Levien
12618bf7f5 am 7c1b1087: Merge "Fix for "Can\'t place cursor after combining accent"" into klp-dev
* commit '7c1b10872f3d57b3afdb0f070fcf602e4d72df37':
  Fix for "Can't place cursor after combining accent"
2013-09-20 16:31:22 -07:00
Raph Levien
7c1b10872f Merge "Fix for "Can't place cursor after combining accent"" into klp-dev 2013-09-20 23:27:57 +00:00
Igor Murashkin
5b65ad41b2 am ab98a0b1: Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev
* commit 'ab98a0b116884aae3c5a90ddf87fe677e2a351a1':
  camera2: Add more camera device states, make #openCamera async.
2013-09-20 16:24:01 -07:00
destradaa
93d3bdb61a am 47d620ac: Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev
* commit '47d620ac282870f1f7142bd86ab32d14ad9ee91f':
  Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer
2013-09-20 16:23:58 -07:00
Igor Murashkin
ab98a0b116 Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev 2013-09-20 23:21:51 +00:00
destradaa
47d620ac28 Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev 2013-09-20 23:18:15 +00:00
Adam Lesinski
a35ff66127 am d473ebb7: Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev
* commit 'd473ebb7c4f212cb9f74fe748bb8b95d7d126417':
  Surfaces ParcelFileDescriptor#parseMode() as API
2013-09-20 16:01:34 -07:00
Jeff Sharkey
578f67c25c am dfed2448: Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev
* commit 'dfed244876d6c0ddd8d8bd2b8f3b970cd0a1ab95':
  Delegate mkdirs() to vold when lacking perms.
2013-09-20 16:01:28 -07:00
Adam Lesinski
d473ebb7c4 Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev 2013-09-20 22:59:12 +00:00
Jeff Sharkey
dfed244876 Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev 2013-09-20 22:56:07 +00: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
Robert Greenwalt
13820af302 Fix BatchScan request coalesing
bug:10407896
Change-Id: Ic22c7d8b2a80d490d208570782a12e42d4690f5c
2013-09-20 15:30:17 -07:00
Raph Levien
373b7a8d4e Fix for "Can't place cursor after combining accent"
This patch fixes behavior where attempting to place the cursor at
the end of a string where the last character is a combining accent
actually placed it before that accent. This was especially annoying
for editing Thai text, because it made it difficult to delete a
trailing tone mark.

Fixes bug 8947569 "Can't place cursor after combining accent" and bug
10398332 "[Thailand] Thai Language(IME) -- Can't delete Thai tone mark
while writing message"

Change-Id: Ida1933c8f0ab6cdb0200db39891e9389e4bdba86
2013-09-20 15:21:47 -07:00
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