diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2016-06-22 22:41:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 22:41:57 +0000 |
| commit | eb3f3aa46d6494766495f06b585feacfc6543d26 (patch) | |
| tree | aaf042e22a1a0f12a3e745d094fb537367e85d46 /core/java/android | |
| parent | a34b917ce0d63ec868607fbe25c166116dee94c8 (diff) | |
| parent | f9f2c7ceefa1348c57f1070327cf5d36c9c0d8d5 (diff) | |
Merge \"Use granted userId to look up provider info\" into nyc-dev
am: f9f2c7ceef
Change-Id: I7af8b1867bb4a1784658f445c91158c0e4c43667
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/ContentResolver.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index aeda7a24066d..c8d89204d8d4 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -1819,6 +1819,7 @@ public abstract class ContentResolver { * calling app. That is, the returned permissions have been granted * <em>to</em> the calling app. Only persistable grants taken with * {@link #takePersistableUriPermission(Uri, int)} are returned. + * <p>Note: Some of the returned URIs may not be usable until after the user is unlocked. * * @see #takePersistableUriPermission(Uri, int) * @see #releasePersistableUriPermission(Uri, int) @@ -1837,6 +1838,7 @@ public abstract class ContentResolver { * calling app. That is, the returned permissions have been granted * <em>from</em> the calling app. Only grants taken with * {@link #takePersistableUriPermission(Uri, int)} are returned. + * <p>Note: Some of the returned URIs may not be usable until after the user is unlocked. */ public @NonNull List<UriPermission> getOutgoingPersistedUriPermissions() { try { |