Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7a5eae9 authored Mar 15, 2021 by Issei Suzuki Committed by Automerger Merge Worker Mar 15, 2021

Merge "Supress IKeygaurdSerivce#setOccluded binder call from WM." into sc-dev am: 9ab4b954

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13825905

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I171f739a302c89af50205f2bc52d98456f6bfb9c

parents a7d7b917 9ab4b954

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -149,9 +149,14 @@ public class KeyguardService extends Service {
		RemoteAnimationTarget[] wallpapers,
		RemoteAnimationTarget[] nonApps,
		IRemoteAnimationFinishedCallback finishedCallback) {
		// TODO(bc-unlock): Calls KeyguardViewMediator#setOccluded to update the state and
		// run animation.
		try {
		if (transit == TRANSIT_OLD_KEYGUARD_OCCLUDE) {
		mBinder.setOccluded(true /* isOccluded /, true / animate */);
		} else if (transit == TRANSIT_OLD_KEYGUARD_UNOCCLUDE) {
		mBinder.setOccluded(false /* isOccluded /, true / animate */);
		}
		// TODO(bc-unlock): Implement occlude/unocclude animation applied on apps,
		// wallpapers and nonApps.
		finishedCallback.onAnimationFinished();
		} catch (RemoteException e) {
		Slog.e(TAG, "RemoteException");

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -258,8 +258,12 @@ public class KeyguardServiceDelegate {
		}
		}

		/**
		* @deprecated Notify occlude status change via remote animation.
		*/
		@Deprecated
		public void setOccluded(boolean isOccluded, boolean animate) {
		if (mKeyguardService != null) {
		if (!WindowManagerService.sEnableRemoteKeyguardAnimation && mKeyguardService != null) {
		if (DEBUG) Log.v(TAG, "setOccluded(" + isOccluded + ") animate=" + animate);
		mKeyguardService.setOccluded(isOccluded, animate);
		}