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 
am: 1a31586918

Change-Id: If200a6f4ca5556c367fb427b93e580d3bb2a39a6
This commit is contained in:
Steven Wu
2018-05-22 08:27:58 -07:00
committed by android-build-merger
parent 147025feb6 1a31586918
commit b37470ff6d
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();
try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) {
if (provider == null) {
throw new IllegalArgumentException("Unknown URI " + uri);
Log.w(TAG, String.format("Unknown URI: %s", uri));
return null;
}
Bundle extras = new Bundle();
extras.putParcelable(SliceProvider.EXTRA_BIND_URI, uri);
@@ -306,7 +307,8 @@ public class SliceManager {
.authority(authority).build();
try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) {
if (provider == null) {
throw new IllegalArgumentException("Unknown URI " + uri);
Log.w(TAG, String.format("Unknown URI: %s", uri));
return null;
}
Bundle extras = new Bundle();
extras.putParcelable(SliceProvider.EXTRA_INTENT, intent);
@@ -383,7 +385,8 @@ public class SliceManager {
.authority(authority).build();
try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) {
if (provider == null) {
throw new IllegalArgumentException("Unknown URI " + uri);
Log.w(TAG, String.format("Unknown URI: %s", uri));
return null;
}
Bundle extras = new Bundle();
extras.putParcelable(SliceProvider.EXTRA_INTENT, intent);