Merge \"Show unsopported display size dialog on relaunch\" into nyc-dev

am: 354c8cde6c

Change-Id: I46f232290ebc5cf924bf696f20eb134076e83b4f

1 files changed, 2 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index a1da1d8c3887..080126347f46 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -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;