Merge "Add event log for keyguard occlude status chagne." into udc-dev (89942fd0) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import com.android.internal.policy.IKeyguardExitCallback;
		import com.android.internal.policy.IKeyguardService;
		import com.android.server.UiThread;
		import com.android.server.policy.WindowManagerPolicy.OnKeyguardExitResult;
		import com.android.server.wm.EventLogTags;

		import java.io.PrintWriter;

		@@ -255,6 +256,11 @@ public class KeyguardServiceDelegate {
		public void setOccluded(boolean isOccluded, boolean notify) {
		if (mKeyguardService != null && notify) {
		if (DEBUG) Log.v(TAG, "setOccluded(" + isOccluded + ")");
		EventLogTags.writeWmSetKeyguardOccluded(
		isOccluded ? 1 : 0,
		0 /* animate */,
		0 /* transit */,
		"setOccluded");
		mKeyguardService.setOccluded(isOccluded, false /* animate */);
		}
		mKeyguardState.occluded = isOccluded;

+3 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ option java_package com.android.server.wm
		30066 wm_add_to_stopping (User\|1\|5),(Token\|1\|5),(Component Name\|3),(Reason\|3)

		# Keyguard status changed
		30067 wm_set_keyguard_shown (Display Id\|1\|5),(keyguardShowing\|1),(aodShowing\|1),(keyguardGoingAway\|1),(Reason\|3)
		30067 wm_set_keyguard_shown (Display Id\|1\|5),(keyguardShowing\|1),(aodShowing\|1),(keyguardGoingAway\|1),(occluded\|1),(Reason\|3)

		# Out of memory for surfaces.
		31000 wm_no_surface_memory (Window\|3),(PID\|1\|5),(Operation\|3)
		@@ -65,6 +65,8 @@ option java_package com.android.server.wm

		# bootanim finished:
		31007 wm_boot_animation_done (time\|2\|3)
		# Notify keyguard occlude statuc change to SysUI.
		31008 wm_set_keyguard_occluded (occluded\|1),(animate\|1),(transit\|1),(Channel\|3)

		# Back navigation.
		31100 wm_back_navi_canceled (Reason\|3)

+12 −1

Original line number	Diff line number	Diff line
		@@ -188,6 +188,7 @@ class KeyguardController {
		keyguardShowing ? 1 : 0,
		aodShowing ? 1 : 0,
		state.mKeyguardGoingAway ? 1 : 0,
		state.mOccluded ? 1 : 0,
		"setKeyguardShown");

		// Update the task snapshot if the screen will not be turned off. To make sure that the
		@@ -253,9 +254,10 @@ class KeyguardController {
		try {
		EventLogTags.writeWmSetKeyguardShown(
		displayId,
		1 /* keyguardShowing */,
		state.mKeyguardShowing ? 1 : 0,
		state.mAodShowing ? 1 : 0,
		1 /* keyguardGoingAway */,
		state.mOccluded ? 1 : 0,
		"keyguardGoingAway");
		final int transitFlags = convertTransitFlags(flags);
		final DisplayContent dc = mRootWindowContainer.getDefaultDisplay();
		@@ -669,6 +671,15 @@ class KeyguardController {

		boolean hasChange = false;
		if (lastOccluded != mOccluded) {
		if (mDisplayId == DEFAULT_DISPLAY) {
		EventLogTags.writeWmSetKeyguardShown(
		mDisplayId,
		mKeyguardShowing ? 1 : 0,
		mAodShowing ? 1 : 0,
		mKeyguardGoingAway ? 1 : 0,
		mOccluded ? 1 : 0,
		"updateVisibility");
		}
		controller.handleOccludedChanged(mDisplayId, mTopOccludesActivity);
		hasChange = true;
		} else if (!lastKeyguardGoingAway && mKeyguardGoingAway) {

+14 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.server.wm;

		import static android.view.WindowManager.TRANSIT_OLD_KEYGUARD_UNOCCLUDE;

		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_REMOTE_ANIMATIONS;
		import static com.android.server.wm.AnimationAdapterProto.REMOTE;
		import static com.android.server.wm.RemoteAnimationAdapterWrapperProto.TARGET;
		@@ -195,6 +197,13 @@ class RemoteAnimationController implements DeathRecipient {
		+ " transit=%s, apps=%d, wallpapers=%d, nonApps=%d",
		AppTransition.appTransitionOldToString(transit), appTargets.length,
		wallpaperTargets.length, nonAppTargets.length);
		if (AppTransition.isKeyguardOccludeTransitOld(transit)) {
		EventLogTags.writeWmSetKeyguardOccluded(
		transit == TRANSIT_OLD_KEYGUARD_UNOCCLUDE ? 0 : 1,
		1 /* animate */,
		transit,
		"onAnimationStart");
		}
		mRemoteAnimationAdapter.getRunner().onAnimationStart(transit, appTargets,
		wallpaperTargets, nonAppTargets, mFinishedCallback);
		} catch (RemoteException e) {
		@@ -356,6 +365,11 @@ class RemoteAnimationController implements DeathRecipient {
		final boolean isKeyguardOccluded = mDisplayContent.isKeyguardOccluded();

		try {
		EventLogTags.writeWmSetKeyguardOccluded(
		isKeyguardOccluded ? 1 : 0,
		0 /* animate */,
		0 /* transit */,
		"onAnimationCancelled");
		mRemoteAnimationAdapter.getRunner().onAnimationCancelled(isKeyguardOccluded);
		} catch (RemoteException e) {
		Slog.e(TAG, "Failed to notify cancel", e);