Merge "Resume when keyguard start going away" (405a1f45) · Commits · e / os / android_frameworks_base

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25731,7 +25731,6 @@ public class ActivityManagerService extends IActivityManager.Stub
	public void notifyAppTransitionFinished() {		public void notifyAppTransitionFinished() {
	synchronized (ActivityManagerService.this) {		synchronized (ActivityManagerService.this) {
	mStackSupervisor.notifyAppTransitionDone();		mStackSupervisor.notifyAppTransitionDone();
	mKeyguardController.notifyAppTransitionDone();
	}		}
	}		}

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

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1625,6 +1625,20 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
	// The activity may be waiting for stop, but that is no longer appropriate for it.		// The activity may be waiting for stop, but that is no longer appropriate for it.
	mStackSupervisor.mStoppingActivities.remove(this);		mStackSupervisor.mStoppingActivities.remove(this);
	mStackSupervisor.mGoingToSleepActivities.remove(this);		mStackSupervisor.mGoingToSleepActivities.remove(this);

			// If the activity is stopped or stopping, cycle to the paused state.
			if (state == STOPPED \|\| state == STOPPING) {
			// Capture reason before state change
			final String reason = getLifecycleDescription("makeVisibleIfNeeded");

			// An activity must be in the {@link PAUSING} state for the system to validate
			// the move to {@link PAUSED}.
			state = PAUSING;
			service.mLifecycleManager.scheduleTransaction(app.thread, appToken,
			PauseActivityItem.obtain(finishing, false /* userLeaving */,
			configChangeFlags, false /* dontReport */)
			.setDescription(reason));
			}
	} catch (Exception e) {		} catch (Exception e) {
	// Just skip on any failure; we'll make it visible when it next restarts.		// Just skip on any failure; we'll make it visible when it next restarts.
	Slog.w(TAG, "Exception thrown making visibile: " + intent.getComponent(), e);		Slog.w(TAG, "Exception thrown making visibile: " + intent.getComponent(), e);

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

+2 −8

Original line number	Original line	Diff line number	Diff line
	@@ -117,14 +117,11 @@ class KeyguardController {
	mSecondaryDisplayShowing = secondaryDisplayShowing;		mSecondaryDisplayShowing = secondaryDisplayShowing;
	if (showingChanged) {		if (showingChanged) {
	dismissDockedStackIfNeeded();		dismissDockedStackIfNeeded();
	if (showing) {
	setKeyguardGoingAway(false);		setKeyguardGoingAway(false);
			if (showing) {
	mDismissalRequested = false;		mDismissalRequested = false;
	}		}
	}		}
	if (!showing) {
	mStackSupervisor.resumeFocusedStackTopActivityLocked();
	}
	mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);		mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
	updateKeyguardSleepToken();		updateKeyguardSleepToken();
	}		}
	@@ -149,6 +146,7 @@ class KeyguardController {
	updateKeyguardSleepToken();		updateKeyguardSleepToken();

	// Some stack visibility might change (e.g. docked stack)		// Some stack visibility might change (e.g. docked stack)
			mStackSupervisor.resumeFocusedStackTopActivityLocked();
	mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);		mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
	mStackSupervisor.addStartingWindowsForVisibleActivities(true /* taskSwitch */);		mStackSupervisor.addStartingWindowsForVisibleActivities(true /* taskSwitch */);
	mWindowManager.executeAppTransition();		mWindowManager.executeAppTransition();
	@@ -395,8 +393,4 @@ class KeyguardController {
	proto.write(KEYGUARD_OCCLUDED, mOccluded);		proto.write(KEYGUARD_OCCLUDED, mOccluded);
	proto.end(token);		proto.end(token);
	}		}

	public void notifyAppTransitionDone() {
	setKeyguardGoingAway(false);
	}
	}		}