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

Commit 5c2d170a authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge \\"Show unsopported display size dialog on relaunch\\" into nyc-dev am: 354c8cde 

am: c13127f2

Change-Id: Ie4b2397641342303742198ef50c4e21d97909aaf
parents dbedcbce c13127f2

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;