Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrii Kulian
2016-06-23 01:00:35 +00:00
committed by Android (Google) Code Review
parent 22f887a014 f42cbe8338
commit 354c8cde6c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -4741,6 +4741,8 @@ final class ActivityStack {
r.results = null; r.results = null;
r.newIntents = null; r.newIntents = null;
} }
mService.showUnsupportedZoomDialogIfNeededLocked(r);
mService.showAskCompatModeDialogLocked(r);
} else { } else {
mHandler.removeMessages(PAUSE_TIMEOUT_MSG, r); mHandler.removeMessages(PAUSE_TIMEOUT_MSG, r);
r.state = ActivityState.PAUSED; r.state = ActivityState.PAUSED;