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

Commit 6bea8a4b authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev 

am: 0b795eb8

Change-Id: I7b480717453d7ace26033066279a3c20e68cb7aa
parents 3c0f0331 0b795eb8

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

+4 −2
Original line number Diff line number Diff line
@@ -273,7 +273,8 @@ public class SliceManager { 
     */

    public @Nullable Uri mapIntentToUri(@NonNull Intent intent) {

        Preconditions.checkNotNull(intent, "intent");

        Preconditions.checkArgument(intent.getComponent() != null || intent.getPackage() != null,

        Preconditions.checkArgument(intent.getComponent() != null || intent.getPackage() != null

                || intent.getData() != null,

                "Slice intent must be explicit %s", intent);

        ContentResolver resolver = mContext.getContentResolver();
@@ -337,7 +338,8 @@ public class SliceManager { 
    public @Nullable Slice bindSlice(@NonNull Intent intent,

            @NonNull List<SliceSpec> supportedSpecs) {

        Preconditions.checkNotNull(intent, "intent");

        Preconditions.checkArgument(intent.getComponent() != null || intent.getPackage() != null,

        Preconditions.checkArgument(intent.getComponent() != null || intent.getPackage() != null

                || intent.getData() != null,

                "Slice intent must be explicit %s", intent);

        ContentResolver resolver = mContext.getContentResolver();