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

Merge "Do not throw IllegalArgumentException in slice manager." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-22 15:16:26 +00:00
committed by Android (Google) Code Review
parent 6433ac13bd a14c6b9cad
commit 1a31586918
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,7 +245,8 @@ public class SliceManager {
ContentResolver resolver = mContext.getContentResolver(); ContentResolver resolver = mContext.getContentResolver();
try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) { try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) {
if (provider == null) { if (provider == null) {
throw new IllegalArgumentException("Unknown URI " + uri); Log.w(TAG, String.format("Unknown URI: %s", uri));
return null;
} }
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putParcelable(SliceProvider.EXTRA_BIND_URI, uri); extras.putParcelable(SliceProvider.EXTRA_BIND_URI, uri);
@@ -306,7 +307,8 @@ public class SliceManager {
.authority(authority).build(); .authority(authority).build();
try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) { try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) {
if (provider == null) { if (provider == null) {
throw new IllegalArgumentException("Unknown URI " + uri); Log.w(TAG, String.format("Unknown URI: %s", uri));
return null;
} }
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putParcelable(SliceProvider.EXTRA_INTENT, intent); extras.putParcelable(SliceProvider.EXTRA_INTENT, intent);
@@ -383,7 +385,8 @@ public class SliceManager {
.authority(authority).build(); .authority(authority).build();
try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) { try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) {
if (provider == null) { if (provider == null) {
throw new IllegalArgumentException("Unknown URI " + uri); Log.w(TAG, String.format("Unknown URI: %s", uri));
return null;
} }
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putParcelable(SliceProvider.EXTRA_INTENT, intent); extras.putParcelable(SliceProvider.EXTRA_INTENT, intent);