From a14c6b9cada2aeb52d40674541a7f8bb970720bc Mon Sep 17 00:00:00 2001 From: Steven Wu Date: Tue, 22 May 2018 09:08:22 -0400 Subject: [PATCH] Do not throw IllegalArgumentException in slice manager. Test: manual Bug: 80087497 Change-Id: Ic05c812f41d0153c8745b08718513d4e095ab27b --- core/java/android/app/slice/SliceManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/java/android/app/slice/SliceManager.java b/core/java/android/app/slice/SliceManager.java index f682ec1c31d40..ad862fcd86ff0 100644 --- a/core/java/android/app/slice/SliceManager.java +++ b/core/java/android/app/slice/SliceManager.java @@ -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);