Merge "Fix NPE from refactoring"

2018-01-24 22:15:36 +00:00
parent 1a7bc24fd8 a9033876de
commit 6d2b351791
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -13746,7 +13746,7 @@ public class ActivityManagerService extends IActivityManager.Stub
                int index = task.mActivities.lastIndexOf(r);
                if (index > 0) {
                    ActivityRecord under = task.mActivities.get(index - 1);
-                    under.returningOptions = safeOptions.getOptions(r);
+                    under.returningOptions = safeOptions != null ? safeOptions.getOptions(r) : null;
                }
                final boolean translucentChanged = r.changeWindowTranslucency(false);
                if (translucentChanged) {