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

am: 354c8cde6c Change-Id: I46f232290ebc5cf924bf696f20eb134076e83b4f
2016-06-23 01:07:00 +00:00
parent 54e12ac7f5 354c8cde6c
commit 076b51536c
1 changed files with 2 additions and 0 deletions
--- 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;