diff options
| author | Jason Monk <jmonk@google.com> | 2018-05-31 16:40:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-31 16:40:50 -0700 |
| commit | aa8802a9d98c5fb9ab818c35a7a4f5533a47fed4 (patch) | |
| tree | ba97fc88677c497b107e204cd623820bb8d8bcd5 | |
| parent | 38bec182d2ac52f6a5e1c63c659b17d9def93e0f (diff) | |
| parent | b9e5da09b5a91b7ab7beaf712c44b5d630ab360c (diff) | |
Merge "Don't use stable providers for slices" into pi-dev am: de8e3c227c
am: b9e5da09b5
Change-Id: Ia10ee4f9ca75d4bba58aa33e386fb929e987a68a
| -rw-r--r-- | core/java/android/app/slice/SliceManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/slice/SliceManager.java b/core/java/android/app/slice/SliceManager.java index ad862fcd86ff..26498e81253a 100644 --- a/core/java/android/app/slice/SliceManager.java +++ b/core/java/android/app/slice/SliceManager.java @@ -221,7 +221,7 @@ public class SliceManager { @WorkerThread public @NonNull Collection<Uri> getSliceDescendants(@NonNull Uri uri) { ContentResolver resolver = mContext.getContentResolver(); - try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) { + try (ContentProviderClient provider = resolver.acquireUnstableContentProviderClient(uri)) { Bundle extras = new Bundle(); extras.putParcelable(SliceProvider.EXTRA_BIND_URI, uri); final Bundle res = provider.call(SliceProvider.METHOD_GET_DESCENDANTS, null, extras); @@ -243,7 +243,7 @@ public class SliceManager { public @Nullable Slice bindSlice(@NonNull Uri uri, @NonNull Set<SliceSpec> supportedSpecs) { Preconditions.checkNotNull(uri, "uri"); ContentResolver resolver = mContext.getContentResolver(); - try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) { + try (ContentProviderClient provider = resolver.acquireUnstableContentProviderClient(uri)) { if (provider == null) { Log.w(TAG, String.format("Unknown URI: %s", uri)); return null; @@ -305,7 +305,7 @@ public class SliceManager { if (authority == null) return null; Uri uri = new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) .authority(authority).build(); - try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) { + try (ContentProviderClient provider = resolver.acquireUnstableContentProviderClient(uri)) { if (provider == null) { Log.w(TAG, String.format("Unknown URI: %s", uri)); return null; @@ -383,7 +383,7 @@ public class SliceManager { if (authority == null) return null; Uri uri = new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) .authority(authority).build(); - try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) { + try (ContentProviderClient provider = resolver.acquireUnstableContentProviderClient(uri)) { if (provider == null) { Log.w(TAG, String.format("Unknown URI: %s", uri)); return null; |