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

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

Merge "Make Instrumentation more robust to other inputs" into pi-dev 

am: 30715222

Change-Id: Ifc3e5c1959a3b25025f396fbfc91363580b239ad
parents 719b3d3c 30715222

core/java/android/app/Instrumentation.java

+6 −1
Original line number Diff line number Diff line
@@ -1210,11 +1210,16 @@ public class Instrumentation { 
            Intent intent)

            throws InstantiationException, IllegalAccessException,

            ClassNotFoundException {

        String pkg = intent.getComponent().getPackageName();

        String pkg = intent != null && intent.getComponent() != null

                ? intent.getComponent().getPackageName() : null;

        return getFactory(pkg).instantiateActivity(cl, className, intent);

    }



    private AppComponentFactory getFactory(String pkg) {

        if (pkg == null) {

            Log.e(TAG, "No pkg specified, disabling AppComponentFactory");

            return AppComponentFactory.DEFAULT;

        }

        if (mThread == null) {

            Log.e(TAG, "Uninitialized ActivityThread, likely app-created Instrumentation,"

                    + " disabling AppComponentFactory", new Throwable());