Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ashwini Oruganti
2021-04-15 15:13:23 +00:00
committed by Android (Google) Code Review
parent 41b2271b38 cfd031a9fb
commit aeb5dbf1c5
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/app/PendingIntent.java
View File

@@ -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,19 +370,9 @@ 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);
}
}
}