Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am: 22f887a014

am: 076b51536c Change-Id: Id4012c19b97a03a04850c2d1b307680b324e4890
2016-06-23 01:10:57 +00:00
parent dbedcbce13 076b51536c
commit 7548d9bc6d
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;