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

Commit 076b5153 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

Change-Id: I46f232290ebc5cf924bf696f20eb134076e83b4f
parents 54e12ac7 354c8cde

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

+2 −0
Original line number Diff line number Diff line
@@ -4740,6 +4740,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;