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

Commit 37820711 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Update Instrumentation.newActivity to pass non-null application. 

Activity.attach expects a non-null application, so pass an empty
applicaiton if Instrumentation.newActivity is called with a null obj.

Change-Id: If4a131ef46f101b8b4a726886fe76412c45c30ec
Fixes: 73294588
Test: atest tests/app/src/android/app/cts/TabActivityTest.java
parent d450c4bc

core/java/android/app/Instrumentation.java

+4 −0
Original line number Diff line number Diff line
@@ -1182,6 +1182,10 @@ public class Instrumentation { 
            IllegalAccessException {

        Activity activity = (Activity)clazz.newInstance();

        ActivityThread aThread = null;

        // Activity.attach expects a non-null Application Object.

        if (application == null) {

            application = new Application();

        }

        activity.attach(context, aThread, this, token, 0 /* ident */, application, intent,

                info, title, parent, id,

                (Activity.NonConfigurationInstances)lastNonConfigurationInstance,