Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't use stable providers for slices" into pi-dev am: de8e3c227c

Browse Source 
am: b9e5da09b5

Change-Id: Ia10ee4f9ca75d4bba58aa33e386fb929e987a68a
This commit is contained in:
Jason Monk
2018-05-31 16:40:50 -07:00
committed by android-build-merger
parent 38bec182d2 b9e5da09b5
commit aa8802a9d9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/slice/SliceManager.java
View File

@@ -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;