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

Commit aeb5dbf1 authored by Ashwini Oruganti's avatar Ashwini Oruganti Committed by Android (Google) Code Review
Browse files

Merge "Enforce the PI mutability flag requirement for test apps" into sc-dev

parents 41b2271b cfd031a9
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import android.os.RemoteException;
import android.os.UserHandle;
import android.util.AndroidException;
import android.util.ArraySet;
import android.util.Log;
import android.util.proto.ProtoOutputStream;

import com.android.internal.os.IResultReceiver;
@@ -371,21 +370,11 @@ public final class PendingIntent implements Parcelable {
                "Cannot set both FLAG_IMMUTABLE and FLAG_MUTABLE for PendingIntent");
        }

        // TODO(b/178092897) Remove the below instrumentation check and enforce
        // the explicit mutability requirement for apps under instrumentation.
        ActivityThread thread = ActivityThread.currentActivityThread();
        Instrumentation mInstrumentation = thread.getInstrumentation();

        if (Compatibility.isChangeEnabled(PENDING_INTENT_EXPLICIT_MUTABILITY_REQUIRED)
                && !flagImmutableSet && !flagMutableSet) {

            if (mInstrumentation.isInstrumenting()) {
                Log.e(TAG, msg);
            } else {
                throw new IllegalArgumentException(msg);
        }
    }
    }

    /**
     * Retrieve a PendingIntent that will start a new activity, like calling