Commit d9077bf7 authored Jun 23, 2016 by Andrii Kulian Committed by android-build-merger Jun 23, 2016

Merge \\\"Clarify docs for PopupWindow width/height parameters\\\" into...

Merge \\\"Clarify docs for PopupWindow width/height parameters\\\" into nyc-dev am: 22f887a0 am: 076b5153
am: 7548d9bc

Change-Id: I2641d812725fdda80c220e4ed9a1d83b30c9fc88

parents 306e3b2b 7548d9bc

services/core/java/com/android/server/am/ActivityStack.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;