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

Commit a8152f6b authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Fixes potential NPE when adjust starting window flags." into main

parents 09c127d3 83e32d4e

services/core/java/com/android/server/wm/ActivityRecord.java

+2 −1
Original line number Diff line number Diff line
@@ -2707,7 +2707,8 @@ final class ActivityRecord extends WindowToken { 
     * This prevents briefly appearing the app context and causing secure concern.

     */

    void deferStartingWindowRemovalForKeyguardUnoccluding() {

        if (mStartingData.mRemoveAfterTransaction != AFTER_TRANSITION_FINISH

        if (mStartingData != null

                && mStartingData.mRemoveAfterTransaction != AFTER_TRANSITION_FINISH

                && isKeyguardLocked() && !canShowWhenLockedInner(this) && !isVisibleRequested()

                && mTransitionController.inTransition(this)) {

            mStartingData.mRemoveAfterTransaction = AFTER_TRANSITION_FINISH;