Commit Graph

2213 Commits

Author SHA1 Message Date
Christopher Tate
1f5ca7fed2 am 7b3cfebc: am f1fbe113: am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '7b3cfebce3ab51e96d6c89317ea48b8bce640d9d':
  Cursor leakage due to cancellation signal
2014-01-10 00:07:09 +00:00
Christopher Tate
4ba1bbadb7 am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '5fbcb1347494e17dc9e9cd66d8e47a3972a8b90d':
  Cursor leakage due to cancellation signal
2014-01-09 12:47:50 -08:00
Peter Eliasson
55eda43af9 Cursor leakage due to cancellation signal
If a query call was cancelled, the cursor adaptor might leak. The
adaptor is now closed if any exception is thrown during query.

Change-Id: Ic4c2edeaf2fcef56b4ef59484a36d3233aa12dbc
2013-12-19 09:08:05 +01:00
Narayan Kamath
28635ca3e3 am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '44291d9c2722e0d22dc6f909585f4302abdce205':
  Use StrictJarFile instead of JarFile for cert collection.
2013-12-16 07:20:26 -08:00
Narayan Kamath
1f0299a9cb Use StrictJarFile instead of JarFile for cert collection.
This ensures that we use the same underlying zip
processing code as the runtimes.

bug: 10193060

(cherry picked from commit eb565dc527)

Change-Id: Iaaa26b02678278394619d0a41613d9ceeae3203c
2013-12-13 16:21:58 +00:00
Narayan Kamath
eb565dc527 Use StrictJarFile instead of JarFile for cert collection.
This ensures that we use the same underlying zip
processing code as the runtimes.

bug: 10193060

Change-Id: I0f287dd6fa95207cd02f648528ef6c08dd360a72
2013-12-12 17:53:48 +00:00
John Spurlock
cce137733b am e4f96e28: am 56979b22: am 125d133b: Fix bad @see links in Intent.java.
* commit 'e4f96e281f85078d5420fdc52e00da3c6392ba1a':
  Fix bad @see links in Intent.java.
2013-11-25 10:45:43 -08:00
John Spurlock
56979b2234 am 125d133b: Fix bad @see links in Intent.java.
* commit '125d133bcce56403a9b4d1cdbbc61a7cb1d7f8e1':
  Fix bad @see links in Intent.java.
2013-11-25 18:39:33 +00:00
John Spurlock
125d133bcc Fix bad @see links in Intent.java.
Change-Id: Ifa283214798f8d2de4f8bdb17ed78609a7d43293
2013-11-25 11:58:37 -05:00
John Spurlock
6090995951 Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
2013-11-20 11:31:47 -05:00
Christopher Tate
63e1883d96 am a5acd62b: am 6e5cf573: am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
* commit 'a5acd62bdefe5b616c0ea080434e9dd221169527':
  Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:49:15 -08:00
Christopher Tate
99437f252b Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev 2013-11-14 22:59:20 +00:00
Christopher Tate
ba629da331 Ensure recipient can be launched before attempting broadcast delivery
User removal or eviction inherently races with broadcast delivery.  This
patch introduces a latest-possible recheck of the availbility of the
target application before attempting to send it a broadcast.

Once the process has actually been spun up the system is essentially
committed to presenting it as a running application, and there is no
later check of the availability of the app: the failure mode for
continuing to attempt delivery is a crash *in the app process*,
and is user-visible.

We now check the app+userid existence of the intended recipient
just prior to committing to launch its process for receipt, and
if it is no longer available we simply skip that receiver and
continue normally.

Bug 11652784
Bug 11272019
Bug 8263020

Change-Id: Ib19ba2af493250890db7371c1a9f853772db1af0
2013-11-14 12:37:31 -08:00
Matthew Williams
ee7081d1ed Resolve build breakage for merge of fix to b/11559103
Change-Id: Ib42eb48a234f53d34d23f5c661331b2f37be4209
2013-11-14 11:52:58 -08:00
Matthew Williams
bef1f9a370 am 72402f9d: am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
* commit '72402f9de7b108d77316e3c93399b07a2f98c42a':
  SyncManager now returns copy on getCurrentSyncs()
2013-11-14 09:32:02 -08:00
Matthew Williams
a7456e46f4 SyncManager now returns copy on getCurrentSyncs()
Bug:11559103
Added a new getCurrentSyncsCopy() that is public. The other version
is needed for internal SSE calls.

Change-Id: I0287f039a6f75abf04b65b85cb30f78353aeef4f
2013-11-13 18:17:54 -08:00
Alan Viverette
fadfbf1ae0 Merge "Add support for using ColorStateList as GradientDrawable's stroke" 2013-11-05 02:44:31 +00:00
Alan Viverette
a211dd28b9 Add support for using ColorStateList as GradientDrawable's stroke
Refactors isOpaque() so that ColorStateList APIs previously added
on master branch are no longer needed.

Change-Id: I104c9a14ef81db6c4cf141e8fd0ebbd20bd52ee9
2013-11-04 13:46:29 -08:00
Jeff Sharkey
e11b6b036b am b9c28ce9: am 2903d6fa: am c09b6a46: Merge "Better enforcement in DocumentsProvider.call()." into klp-dev
* commit 'b9c28ce9d4f5539e2118822750fa008d5fe77c29':
  Better enforcement in DocumentsProvider.call().
2013-10-31 18:01:56 -07:00
Jeff Sharkey
8a2998eade Better enforcement in DocumentsProvider.call().
Use ContentProvider.enforceWritePermissionInner() to handle all edge
cases around checking if caller has write permissions.  This fixes
bug where call() would throw if caller and provider were the same app.

Bug: 11464234
Change-Id: Iace8e0e4243d56ed1cdcc9680383103975107036
2013-10-31 14:55:44 -07:00
Alan Viverette
519494e207 Add support for using ColorStateList in GradientDrawable
BUG: 11373225
Change-Id: Ie62f1546e8694822aadafe9ef1e57ce458a363d6
2013-10-28 13:15:39 -07:00
Nick Kralevich
47d2b61ddb fix javadoc building.
Change-Id: I2f20b026f5438539ad459a5962da950598158728
2013-10-19 10:43:55 -07:00
Nick Kralevich
69002ae2a2 Fix build.
Change-Id: Icf14e63d759b021b5f9f79f09efa1d101764b9b7
2013-10-19 08:43:08 -07:00
Jeff Sharkey
3e41d9bf41 am fc7c4b9d: am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev
* commit 'fc7c4b9d7234b645adb31cb819b75ba925adab7a':
  Improve DocumentsProvider and contract docs.
2013-10-15 17:55:45 -07:00
Jeff Sharkey
0e4655800b am f53c1a68: am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev
* commit 'f53c1a6841b4c6a1541e9548f425e54c486031d1':
  Improve OPEN/CREATE_DOC docs.
2013-10-15 17:30:23 -07:00
Jeff Sharkey
98f7422e6a am 9f81a1a4: am 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev
* commit '9f81a1a49c4ae01fd815a5ee801764b1362b242e':
  Improve external storage docs on Context.
2013-10-15 17:30:19 -07:00
Jeff Sharkey
e8c00d8ed4 Improve DocumentsProvider and contract docs.
Bug: 10567557
Change-Id: I71e7f7ad172e9986e58b9c9533b1c948c5530397
2013-10-15 16:44:22 -07:00
Jeff Sharkey
adef88a0a9 Improve OPEN/CREATE_DOC docs.
Bug: 10936473
Change-Id: I4378aaaf927f114982191efd4f9887dad075390d
2013-10-15 13:54:47 -07:00
Jeff Sharkey
6feb50b826 Improve external storage docs on Context.
Bug: 10461652
Change-Id: I42a3d887418e126f9dc2a9be8060a8eedd425f8e
2013-10-15 13:01:33 -07:00
Jeff Sharkey
d70d2d8ee3 am 25b99efb: am ac0cb359: am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev
* commit '25b99efb3259c9f6d7bcdacd3cb2bafd6b1a0e63':
  Add extras to AFD, send orientation metadata.
2013-10-15 04:02:48 -07:00
Jeff Sharkey
c1c8f3f97d Add extras to AFD, send orientation metadata.
AssetFileDescriptor augments a ParcelFileDescriptor with details
about how it should be interpreted, so extend it to support a Bundle
of extras.  Then use these extras to share thumbnail orientation
metadata.

The raw image data of EXIF thumbnails matches the orientation of
the enclosing image, but the thumbnail data doesn't repeat the EXIF
flags.  This meant that receivers of openDocumentThumbnail() would
get an image that needed to be transformed, but without enough
context to actually transform it.

Instead of transforming and recompressing the image on the fly on
the provider side, send a transformation hint that the receiver
side can interpret.

Bug: 11205688
Change-Id: Ibc5a7ad002377a55e6ffcb5ac5c8829841002e06
2013-10-14 15:28:19 -07:00
Aravind Akella
45484ee6bb am 67af9ce3: am c73810de: am 45ca531e: Merge "Adding stepcounter & stepdetector feature strings." into klp-dev
* commit '67af9ce31e7642ffc5737b9c29812c4bfdf789e0':
  Adding stepcounter & stepdetector feature strings.
2013-10-14 10:52:15 -07:00
Matthew Williams
d08d6686c5 resolved conflicts for merge of 94b51810 to master
Change-Id: Ida818f066b66c356a84c80e5eab0a4e2cf4ebd49
2013-10-14 10:39:41 -07:00
Aravind Akella
45ca531e77 Merge "Adding stepcounter & stepdetector feature strings." into klp-dev 2013-10-13 22:48:03 +00:00
Eino-Ville Talvala
d38b1302b7 Merge "DO NOT MERGE: Hide new camera API." into klp-dev 2013-10-13 01:50:30 +00:00
Aravind Akella
068b0c05fe Adding stepcounter & stepdetector feature strings.
Change-Id: Ic8cc95612f776db7cb1d1c13a228d5cd8ed64f56
2013-10-12 18:47:00 -07:00
Matthew Williams
32551ae519 Merge "Fix infinite boot-loop bug in SM." into klp-dev 2013-10-11 21:26:19 +00:00
Matthew Williams
632515b9d0 Fix infinite boot-loop bug in SM.
Bug:11064918
If the ContentResolver sync API is used with the empty ("")
string as a provider, the ContentService will throw an RTE.
This cl addresses all the entry points of the API that could
allow this, as well as adds an ifEmpty check at the point of
failure.
Also removed RTE throws from public functions(no point in
crashing the phone).

Change-Id: I57427d12a6cafb3e6d7a32ca0c10b05315b20580
2013-10-11 13:18:22 -07:00
Eino-Ville Talvala
cd92588528 DO NOT MERGE: Hide new camera API.
Not yet ready.

Bug: 11141002

Change-Id: I4704bffb9ba36af47a66dc5b49cbba00be623aae
2013-10-11 19:26:08 +00:00
Dianne Hackborn
57de7efbf0 am 61ef6e0f: am 41920afa: am 0b713a09: Merge "Small IntentFilter docs improvement." into klp-dev
* commit '61ef6e0f202032843e4158f047d126c275f3bd01':
  Small IntentFilter docs improvement.
2013-10-11 09:53:34 -07:00
Dianne Hackborn
0ea920d839 Small IntentFilter docs improvement.
Change-Id: I52522e1c007c02d2c4fae8665369d92971689fd2
2013-10-11 09:40:18 -07:00
Jeff Brown
c64ff3782c Minor code cleanup in loaders.
Change-Id: I38147eb9e494b53d41ca3cad042d804631916941
2013-10-09 18:50:56 -07:00
Dianne Hackborn
0fae349f19 am 353ec474: am 8029493f: am f012b777: Merge "Fix some doc issues." into klp-dev
* commit '353ec47422cbd1bb40f19e7ec9ec6b4f300ee3ab':
  Fix some doc issues.
2013-10-09 18:05:32 -07:00
Dianne Hackborn
ebc15ef80f Fix some doc issues.
Bug: 11079621
Bug: 10461610
Bug: 10461369
Bug: 10461417
Change-Id: I7fd966f3cda0660ba20fa15d7164dcac95efadd3
2013-10-09 17:36:57 -07:00
Jeff Sharkey
6699ae2b76 am 45d23585: am 11591b73: am b3da3db3: Merge "Surface outgoing Uri permission grants." into klp-dev
* commit '45d2358510f9670ddf25cc49ee2639e3d41708f7':
  Surface outgoing Uri permission grants.
2013-10-09 15:17:34 -07:00
Jeff Sharkey
bcaac0adec Surface outgoing Uri permission grants.
This enables apps to discover and clean up persisted Uri grants when
the underlying Uri becomes invalid, such as when an account is
removed.

Bug: 11142566
Change-Id: Ieeb36cb1155acf226327ebe91cdd30b822d69d1b
2013-10-09 14:32:11 -07:00
Jeff Sharkey
5b6372171c am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev
* commit '9d1383c61ca0932cb36b104a89c32db15de6a10e':
  Add <intent-filter> support to <provider>.
2013-10-07 15:16:14 -07:00
Jeff Sharkey
bcc77b502b Merge "Add <intent-filter> support to <provider>." into klp-dev 2013-10-07 21:41:45 +00:00
Jeff Sharkey
85f5f81320 Add <intent-filter> support to <provider>.
For the new documents work, we're only interested in the subset of
ContentProviders that actually implement DocumentsContract.  Instead
of returning all providers, add <intent-filter> support to make it
easier to limit the set of returned ProviderInfo.

Define a well-known action for DocumentsProviders, and start using it
when querying for roots.  Continue supporting the old <meta-data>
approach until all apps have been updated.

Bug: 8599233
Change-Id: I05f049bba21311f5421738002f99ee214447c909
2013-10-07 14:19:13 -07:00
Alex Ray
1ac74b74ff am 849ef427: am 2bbf0bfc: am 0ab7c883: Merge "Add Consumer IR feature" into klp-dev
* commit '849ef427b804c3d308e2d74eebd64e19144ef976':
  Add Consumer IR feature
2013-10-04 14:21:20 -07:00