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

Commit 6d2b3517 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE from refactoring"

parents 1a7bc24f a9033876

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

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