Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,621 Commits 3 Branches 0 Tags
887a192ee108c951cf44d85edd20d42b2d4bbcb0
Commit Graph

34753 Commits

Author SHA1 Message Date
Svetoslav Ganov
887a192ee1 am 18e3ca0f: am 678e907e: Merge "Update android.print.PrintAttributes documentation" into klp-dev 
* commit '18e3ca0f148f2cd0390d417059fc7d5ae8c0c061':
  Update android.print.PrintAttributes documentation
 2013-09-20 19:48:33 -07:00
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
Dianne Hackborn
c430e0dc76 am 28db9c64: am 90d51b1a: Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev 
* commit '28db9c64172c046118eede06a5cc6f8d729c50c8':
  Fix issue #10807048:  Groupon: The application crash when user rotates...
 2013-09-20 18:30:43 -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
Svetoslav
69337346ab am 939d9592: am b39ce63d: Merge "Offer to enable a print service after it is installed." into klp-dev 
* commit '939d95924a88f4376f301db72b95e096f69fda7f':
  Offer to enable a print service after it is installed.
 2013-09-20 18:23:50 -07: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
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
Selim Gurun
abb6fbdfb8 Merge "Trace extra headers set by loadurl." 2013-09-21 01:17:25 +00: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
Selim Gurun
90b48b2cde Trace extra headers set by loadurl. 
When tracing webview, also trace application set headers.

Change-Id: Ie93cb1ad143072f4a34f6b18148ff21962c3a068
 2013-09-20 18:08:46 -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
Raph Levien
0325fc366a am 12618bf7: am 7c1b1087: Merge "Fix for "Can\'t place cursor after combining accent"" into klp-dev 
* commit '12618bf7f58ec7a23c6e25db1eec41332727edf8':
  Fix for "Can't place cursor after combining accent"
 2013-09-20 16:34:00 -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
c94a8322cb am 5b65ad41: am ab98a0b1: Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev 
* commit '5b65ad41b2a748fe5c3c24107ffe767ce8a8d8dc':
  camera2: Add more camera device states, make #openCamera async.
 2013-09-20 16:26:36 -07:00
destradaa
fb339b8a0f am 93d3bdb6: 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 '93d3bdb61a7c868d41a259b56af0914d2f6b2303':
  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:26:33 -07: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
5fc67f98b9 am a35ff661: am d473ebb7: Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev 
* commit 'a35ff66127d07117e93268482d7e9719abfd58c3':
  Surfaces ParcelFileDescriptor#parseMode() as API
 2013-09-20 16:05:21 -07:00
Jeff Sharkey
f439bcd953 am 578f67c2: am dfed2448: Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev 
* commit '578f67c25c6bb160cf30bf39b7e41bc039000a5c':
  Delegate mkdirs() to vold when lacking perms.
 2013-09-20 16:05:16 -07: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
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
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
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
David Christie
a31510e47a Clear names from externally supplied WorkSources to WifiManager (b/10733757) 
Change-Id: I36102f13962df2093c1e35fb40081ead647eff32
 2013-09-20 11:41:41 -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
Adam Lesinski
ff5cbab500 Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev 2013-09-20 18:22:17 +00:00
Jim Miller
3f943b1143 am f3d1ef00: am af638c4f: Merge "Add camera affordance to navigation bar on phones" into klp-dev 
* commit 'f3d1ef00c571657bd0464d157905c6b4fae2136f':
  Add camera affordance to navigation bar on phones
 2013-09-20 11:21:11 -07:00
Svetoslav
6e1e8b17c5 am c0e1ae01: am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev 
* commit 'c0e1ae0176b2ce23ea1b19883507cd920712289a':
  Move PdfDocument to android.graphics.pdf
 2013-09-20 11:21:05 -07: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
Dianne Hackborn
a2067473e8 Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest 
Change-Id: Id6432fc1b62db41c6c291ec08450c2fc37ced899
 2013-09-20 10:54:16 -07:00
Dianne Hackborn
9bef5b67dc resolved conflicts for merge of 20021b30 to master 
Change-Id: Ie758de25a277ed0a25bf08e4cd2c57c9519bd52d
 2013-09-20 10:40:34 -07:00