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

Commit 0bce2520 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge "Update Instrumentation.newActivity to pass non-null application." into pi-dev am: 850c6662 

am: 7cefde2e

Change-Id: I870befe49b0f66aedf955bf5c407a794761ea244
parents c83f12b8 7cefde2e

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,