Merge "Update Instrumentation.newActivity to pass non-null application." into pi-dev

2018-04-17 22:06:09 +00:00
parent f55385b595 378207114e
commit 850c6662b0
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -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,