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

Commit 983b981d authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Ensure the intent is non-null and throw NPE early" into main

parents 66a7a866 6227decb

core/java/android/app/Instrumentation.java

+19 −9
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.TimeoutException;



/**
@@ -1890,6 +1891,7 @@ public class Instrumentation { 
    public ActivityResult execStartActivity(

            Context who, IBinder contextThread, IBinder token, Activity target,

            Intent intent, int requestCode, Bundle options) {

        Objects.requireNonNull(intent);

        IApplicationThread whoThread = (IApplicationThread) contextThread;

        Uri referrer = target != null ? target.onProvideReferrer() : null;

        if (referrer != null) {
@@ -1969,6 +1971,10 @@ public class Instrumentation { 
    public int execStartActivitiesAsUser(Context who, IBinder contextThread,

            IBinder token, Activity target, Intent[] intents, Bundle options,

            int userId) {

        Objects.requireNonNull(intents);

        for (int i = intents.length - 1; i >= 0; i--) {

            Objects.requireNonNull(intents[i]);

        }

        IApplicationThread whoThread = (IApplicationThread) contextThread;

        if (isSdkSandboxAllowedToStartActivities()) {

            for (Intent intent : intents) {
@@ -2049,6 +2055,7 @@ public class Instrumentation { 
    public ActivityResult execStartActivity(

        Context who, IBinder contextThread, IBinder token, String target,

        Intent intent, int requestCode, Bundle options) {

        Objects.requireNonNull(intent);

        IApplicationThread whoThread = (IApplicationThread) contextThread;

        if (isSdkSandboxAllowedToStartActivities()) {

            adjustIntentForCtsInSdkSandboxInstrumentation(intent);
@@ -2123,6 +2130,7 @@ public class Instrumentation { 
    public ActivityResult execStartActivity(

            Context who, IBinder contextThread, IBinder token, String resultWho,

            Intent intent, int requestCode, Bundle options, UserHandle user) {

        Objects.requireNonNull(intent);

        IApplicationThread whoThread = (IApplicationThread) contextThread;

        if (isSdkSandboxAllowedToStartActivities()) {

            adjustIntentForCtsInSdkSandboxInstrumentation(intent);
@@ -2176,6 +2184,7 @@ public class Instrumentation { 
            Context who, IBinder contextThread, IBinder token, Activity target,

            Intent intent, int requestCode, Bundle options,

            boolean ignoreTargetSecurity, int userId) {

        Objects.requireNonNull(intent);

        IApplicationThread whoThread = (IApplicationThread) contextThread;

        if (isSdkSandboxAllowedToStartActivities()) {

            adjustIntentForCtsInSdkSandboxInstrumentation(intent);
@@ -2230,6 +2239,7 @@ public class Instrumentation { 
    public void execStartActivityFromAppTask(

            Context who, IBinder contextThread, IAppTask appTask,

            Intent intent, Bundle options) {

        Objects.requireNonNull(intent);

        IApplicationThread whoThread = (IApplicationThread) contextThread;

        if (isSdkSandboxAllowedToStartActivities()) {

            adjustIntentForCtsInSdkSandboxInstrumentation(intent);