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

Commit a9033876 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix NPE from refactoring 

Test: go/wm-smoke
Test ActivityTransitionTest
Fixes: 72439007

Change-Id: I35db3a98778a92374b348c4339b230f091186895
parent 60c9ef4c

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -13623,7 +13623,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) {