Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 850c6662b0

Change-Id: I152d5029366aba600dc81ea6eb9113ff22fd1bec
This commit is contained in:
Sudheer Shanka
2018-04-17 15:39:18 -07:00
committed by android-build-merger
parent c5b3e037a1 850c6662b0
commit 7cefde2e83
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/Instrumentation.java
View File

@@ -1182,6 +1182,10 @@ public class Instrumentation {
IllegalAccessException { IllegalAccessException {
Activity activity = (Activity)clazz.newInstance(); Activity activity = (Activity)clazz.newInstance();
ActivityThread aThread = null; 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, activity.attach(context, aThread, this, token, 0 /* ident */, application, intent,
info, title, parent, id, info, title, parent, id,
(Activity.NonConfigurationInstances)lastNonConfigurationInstance, (Activity.NonConfigurationInstances)lastNonConfigurationInstance,