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

Commit 7548d9bc authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am: 22f887a0 

am: 076b5153

Change-Id: Id4012c19b97a03a04850c2d1b307680b324e4890
parents dbedcbce 076b5153

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

+2 −0
Original line number Diff line number Diff line
@@ -4741,6 +4741,8 @@ final class ActivityStack { 
                r.results = null;

                r.newIntents = null;

            }

            mService.showUnsupportedZoomDialogIfNeededLocked(r);

            mService.showAskCompatModeDialogLocked(r);

        } else {

            mHandler.removeMessages(PAUSE_TIMEOUT_MSG, r);

            r.state = ActivityState.PAUSED;