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

am: c13127f2be Change-Id: Ie4b2397641342303742198ef50c4e21d97909aaf
2016-06-23 01:10:58 +00:00
parent dbedcbce13 c13127f2be
commit 5c2d170aa5
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;