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

am: 354c8cde6c Change-Id: Iaf2b6e209c95223ad4fe45416606b48e08418ca3
2016-06-23 01:06:58 +00:00
parent 483a8dc097 354c8cde6c
commit c13127f2be
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
@@ -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;