From ce1beadc09f4052f632ef0c65aa862797bcb9150 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Thu, 31 May 2018 14:12:52 -0400 Subject: [PATCH] Don't use stable providers for slices Because they aren't what we want. Test: manual + existing tests Bug: 80532760 Change-Id: Ib69799a2ef9440d0d67cea02e6b3c61844535755 --- core/java/android/app/slice/SliceManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/java/android/app/slice/SliceManager.java b/core/java/android/app/slice/SliceManager.java index ad862fcd86ff0..26498e81253a2 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 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 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;