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

Commit b2fcc827 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Fixed NPE when pause is complete on a dead app. am: e852400e am: 699f40e3 

am: 7baba1ab

Change-Id: I39bff66ccedd0e426888a85b1938974dcea60af9
parents 56f98c4a 7baba1ab

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

+3 −1
Original line number Diff line number Diff line
@@ -1303,7 +1303,9 @@ final class ActivityStack { 
            // It is possible the activity was freezing the screen before it was paused.

            // In that case go ahead and remove the freeze this activity has on the screen

            // since it is no longer visible.

            if (prev != null) {

                prev.stopFreezingScreenLocked(true /*force*/);

            }

            mPausingActivity = null;

        }