commit 9ce4714273cee5cfaf0384456f1ad5da296db9bf
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Dec 05 22:37:08 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 05 22:37:12 2016 +0000
tree 0fa8a3f8e2c609968e374b7d6c52daa5d2dd0cec
parent 28947f3b026bb68302f395891f5e7869cc974956
parent 3005e17b03d60a4ce0ed5ba04a9f474533c5c564

Merge "Fix monkey NPE"

core/java/android/app/BackStackRecord.java

diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java
index abb098f..84adbe5 100644
--- a/core/java/android/app/BackStackRecord.java
+++ b/core/java/android/app/BackStackRecord.java
@@ -16,6 +16,8 @@
 
 package android.app;
 
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -349,9 +351,17 @@
 
     public BackStackRecord(FragmentManagerImpl manager) {
         mManager = manager;
-        int targetSdkVersion = manager.mHost.getContext().getApplicationInfo().targetSdkVersion;
-        // TODO: make the check N_MR1 or O
-        mAllowOptimization = targetSdkVersion > Build.VERSION_CODES.N;
+        FragmentHostCallback host = manager.mHost;
+        if (host != null) {
+            Context context = host.getContext();
+            if (context != null) {
+                ApplicationInfo info = context.getApplicationInfo();
+                if (info != null) {
+                    int targetSdkVersion = info.targetSdkVersion;
+                    mAllowOptimization = targetSdkVersion > Build.VERSION_CODES.N_MR1;
+                }
+            }
+        }
     }
 
     public int getId() {