Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56b20ec6 authored by Steven Wu's avatar Steven Wu Committed by android-build-merger
Browse files

Merge "Do not throw IllegalArgumentException in slice manager." into pi-dev am: 1a315869 

am: b37470ff

Change-Id: I57791d3bb1ba5d22bde6d15adad54ba79b97552f
parents 11ff864a b37470ff

core/java/android/app/slice/SliceManager.java

+6 −3
Original line number Diff line number Diff line
@@ -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);