Merge "Some fixes for black screen when pressing home button" into nyc-dev (bce7edf4) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6655,7 +6655,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	synchronized(this) {		synchronized(this) {
	ActivityStack stack = ActivityRecord.getStackLocked(token);		ActivityStack stack = ActivityRecord.getStackLocked(token);
	if (stack != null) {		if (stack != null) {
	ActivityRecord.activityResumedLocked(token);		stack.activityResumedLocked(token);
	}		}
	}		}
	Binder.restoreCallingIdentity(origId);		Binder.restoreCallingIdentity(origId);

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1277,13 +1277,6 @@ final class ActivityRecord {
	}		}
	}		}

	static void activityResumedLocked(IBinder token) {
	final ActivityRecord r = ActivityRecord.forTokenLocked(token);
	if (DEBUG_SAVED_STATE) Slog.i(TAG_STATES, "Resumed activity; dropping state of: " + r);
	r.icicle = null;
	r.haveState = false;
	}

	static int getTaskForActivityLocked(IBinder token, boolean onlyRoot) {		static int getTaskForActivityLocked(IBinder token, boolean onlyRoot) {
	final ActivityRecord r = ActivityRecord.forTokenLocked(token);		final ActivityRecord r = ActivityRecord.forTokenLocked(token);
	if (r == null) {		if (r == null) {

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

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1088,6 +1088,13 @@ final class ActivityStack {
	mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);		mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
	}		}

			final void activityResumedLocked(IBinder token) {
			final ActivityRecord r = ActivityRecord.forTokenLocked(token);
			if (DEBUG_SAVED_STATE) Slog.i(TAG_STATES, "Resumed activity; dropping state of: " + r);
			r.icicle = null;
			r.haveState = false;
			}

	final void activityStoppedLocked(ActivityRecord r, Bundle icicle,		final void activityStoppedLocked(ActivityRecord r, Bundle icicle,
	PersistableBundle persistentState, CharSequence description) {		PersistableBundle persistentState, CharSequence description) {
	if (r.state != ActivityState.STOPPING) {		if (r.state != ActivityState.STOPPING) {
	@@ -4436,10 +4443,10 @@ final class ActivityStack {
	"Moving to " + (andResume ? "RESUMED" : "PAUSED") + " Relaunching " + r		"Moving to " + (andResume ? "RESUMED" : "PAUSED") + " Relaunching " + r
	+ " callers=" + Debug.getCallers(6));		+ " callers=" + Debug.getCallers(6));
	r.forceNewConfig = false;		r.forceNewConfig = false;
			mStackSupervisor.activityRelaunchingLocked(r);
	r.app.thread.scheduleRelaunchActivity(r.appToken, results, newIntents, changes,		r.app.thread.scheduleRelaunchActivity(r.appToken, results, newIntents, changes,
	!andResume, new Configuration(mService.mConfiguration),		!andResume, new Configuration(mService.mConfiguration),
	new Configuration(r.task.mOverrideConfig), preserveWindow);		new Configuration(r.task.mOverrideConfig), preserveWindow);
	mStackSupervisor.activityRelaunchingLocked(r);
	// Note: don't need to call pauseIfSleepingLocked() here, because		// Note: don't need to call pauseIfSleepingLocked() here, because
	// the caller will only pass in 'andResume' if this activity is		// the caller will only pass in 'andResume' if this activity is
	// currently resumed, which implies we aren't sleeping.		// currently resumed, which implies we aren't sleeping.

services/core/java/com/android/server/wm/AppWindowToken.java

+33 −3

Original line number	Original line	Diff line number	Diff line
	@@ -129,6 +129,7 @@ class AppWindowToken extends WindowToken {
	boolean mAlwaysFocusable;		boolean mAlwaysFocusable;

	boolean mAppStopped;		boolean mAppStopped;
			int mPendingRelaunchCount;

	ArrayDeque<Rect> mFrozenBounds = new ArrayDeque<>();		ArrayDeque<Rect> mFrozenBounds = new ArrayDeque<>();

	@@ -531,6 +532,26 @@ class AppWindowToken extends WindowToken {
	}		}
	}		}

			boolean isRelaunching() {
			return mPendingRelaunchCount > 0;
			}

			void startRelaunching() {
			if (canFreezeBounds()) {
			freezeBounds();
			}
			mPendingRelaunchCount++;
			}

			void finishRelaunching() {
			if (canFreezeBounds()) {
			unfreezeBounds();
			}
			if (mPendingRelaunchCount > 0) {
			mPendingRelaunchCount--;
			}
			}

	void addWindow(WindowState w) {		void addWindow(WindowState w) {
	for (int i = allAppWindows.size() - 1; i >= 0; i--) {		for (int i = allAppWindows.size() - 1; i >= 0; i--) {
	WindowState candidate = allAppWindows.get(i);		WindowState candidate = allAppWindows.get(i);
	@@ -579,20 +600,26 @@ class AppWindowToken extends WindowToken {
	}		}
	}		}

			private boolean canFreezeBounds() {
			// For freeform windows, we can't freeze the bounds at the moment because this would make
			// the resizing unresponsive.
			return mTask != null && !mTask.inFreeformWorkspace();
			}

	/**		/**
	* Freezes the task bounds. The size of this task reported the app will be fixed to the bounds		* Freezes the task bounds. The size of this task reported the app will be fixed to the bounds
	* freezed by {@link Task#prepareFreezingBounds} until {@link #unfreezeBounds} gets called, even		* freezed by {@link Task#prepareFreezingBounds} until {@link #unfreezeBounds} gets called, even
	* if they change in the meantime. If the bounds are already frozen, the bounds will be frozen		* if they change in the meantime. If the bounds are already frozen, the bounds will be frozen
	* with a queue.		* with a queue.
	*/		*/
	void freezeBounds() {		private void freezeBounds() {
	mFrozenBounds.offer(new Rect(mTask.mPreparedFrozenBounds));		mFrozenBounds.offer(new Rect(mTask.mPreparedFrozenBounds));
	}		}

	/**		/**
	* Unfreezes the previously frozen bounds. See {@link #freezeBounds}.		* Unfreezes the previously frozen bounds. See {@link #freezeBounds}.
	*/		*/
	void unfreezeBounds() {		private void unfreezeBounds() {
	mFrozenBounds.remove();		mFrozenBounds.remove();
	for (int i = windows.size() - 1; i >= 0; i--) {		for (int i = windows.size() - 1; i >= 0; i--) {
	final WindowState win = windows.get(i);		final WindowState win = windows.get(i);
	@@ -658,7 +685,10 @@ class AppWindowToken extends WindowToken {
	pw.print(" startingMoved="); pw.println(startingMoved);		pw.print(" startingMoved="); pw.println(startingMoved);
	}		}
	if (!mFrozenBounds.isEmpty()) {		if (!mFrozenBounds.isEmpty()) {
	pw.print(prefix); pw.print("mFrozenBounds="); pw.print(mFrozenBounds);		pw.print(prefix); pw.print("mFrozenBounds="); pw.println(mFrozenBounds);
			}
			if (mPendingRelaunchCount != 0) {
			pw.print(prefix); pw.print("mPendingRelaunchCount="); pw.println(mPendingRelaunchCount);
	}		}
	}		}

services/core/java/com/android/server/wm/WindowManagerService.java

+27 −34

Original line number	Original line	Diff line number	Diff line
	@@ -2344,6 +2344,7 @@ public class WindowManagerService extends IWindowManager.Stub
	mTokenMap.remove(token.token);		mTokenMap.remove(token.token);
	} else if (atoken != null) {		} else if (atoken != null) {
	atoken.firstWindowDrawn = false;		atoken.firstWindowDrawn = false;
			atoken.allDrawn = false;
	}		}
	}		}

	@@ -4255,26 +4256,8 @@ public class WindowManagerService extends IWindowManager.Stub
	TAG_WM, "No longer Stopped: " + wtoken);		TAG_WM, "No longer Stopped: " + wtoken);
	wtoken.mAppStopped = false;		wtoken.mAppStopped = false;
	wtoken.setWindowsExiting(false);		wtoken.setWindowsExiting(false);
	}

	// If we are preparing an app transition, then delay changing
	// the visibility of this token until we execute that transition.
	if (okToDisplay() && mAppTransition.isTransitionSet()) {
	// A dummy animation is a placeholder animation which informs others that an
	// animation is going on (in this case an application transition). If the animation
	// was transferred from another application/animator, no dummy animator should be
	// created since an animation is already in progress.
	if (!wtoken.mAppAnimator.usingTransferredAnimation &&
	(!wtoken.startingDisplayed \|\| mSkipAppTransitionAnimation)) {
	if (DEBUG_APP_TRANSITIONS) Slog.v(
	TAG_WM, "Setting dummy animation on: " + wtoken);
	wtoken.mAppAnimator.setDummyAnimation();
	}
	wtoken.inPendingTransaction = true;
	if (visible) {
	mOpeningApps.add(wtoken);		mOpeningApps.add(wtoken);
	wtoken.startingMoved = false;		wtoken.startingMoved = false;
	wtoken.mEnteringAnimation = true;

	// If the token is currently hidden (should be the		// If the token is currently hidden (should be the
	// common case), then we need to set up to wait for		// common case), then we need to set up to wait for
	@@ -4295,6 +4278,24 @@ public class WindowManagerService extends IWindowManager.Stub
	wtoken.sendAppVisibilityToClients();		wtoken.sendAppVisibilityToClients();
	}		}
	}		}
			}

			// If we are preparing an app transition, then delay changing
			// the visibility of this token until we execute that transition.
			if (okToDisplay() && mAppTransition.isTransitionSet()) {
			// A dummy animation is a placeholder animation which informs others that an
			// animation is going on (in this case an application transition). If the animation
			// was transferred from another application/animator, no dummy animator should be
			// created since an animation is already in progress.
			if (!wtoken.mAppAnimator.usingTransferredAnimation &&
			(!wtoken.startingDisplayed \|\| mSkipAppTransitionAnimation)) {
			if (DEBUG_APP_TRANSITIONS) Slog.v(
			TAG_WM, "Setting dummy animation on: " + wtoken);
			wtoken.mAppAnimator.setDummyAnimation();
			}
			wtoken.inPendingTransaction = true;
			if (visible) {
			wtoken.mEnteringAnimation = true;
	} else {		} else {
	wtoken.setWindowsExiting(true);		wtoken.setWindowsExiting(true);
	mClosingApps.add(wtoken);		mClosingApps.add(wtoken);
	@@ -9670,8 +9671,8 @@ public class WindowManagerService extends IWindowManager.Stub
	public void notifyAppRelaunching(IBinder token) {		public void notifyAppRelaunching(IBinder token) {
	synchronized (mWindowMap) {		synchronized (mWindowMap) {
	AppWindowToken appWindow = findAppWindowToken(token);		AppWindowToken appWindow = findAppWindowToken(token);
	if (canFreezeBounds(appWindow)) {		if (appWindow != null) {
	appWindow.freezeBounds();		appWindow.startRelaunching();
	}		}
	}		}
	}		}
	@@ -9679,18 +9680,10 @@ public class WindowManagerService extends IWindowManager.Stub
	public void notifyAppRelaunchingFinished(IBinder token) {		public void notifyAppRelaunchingFinished(IBinder token) {
	synchronized (mWindowMap) {		synchronized (mWindowMap) {
	AppWindowToken appWindow = findAppWindowToken(token);		AppWindowToken appWindow = findAppWindowToken(token);
	if (canFreezeBounds(appWindow)) {		if (appWindow != null) {
	appWindow.unfreezeBounds();		appWindow.finishRelaunching();
	}
	}		}
	}		}

	private boolean canFreezeBounds(AppWindowToken appWindow) {

	// For freeform windows, we can't freeze the bounds at the moment because this would make
	// the resizing unresponsive.
	return appWindow != null && appWindow.mTask != null
	&& !appWindow.mTask.inFreeformWorkspace();
	}		}

	@Override		@Override