From a35b76999991c4cf3ce422c9fbfe35f0256c256f Mon Sep 17 00:00:00 2001
From: Yuncheol Heo <ycheo@google.com>
Date: Fri, 16 Apr 2021 21:15:06 +0000
Subject: [PATCH] Revert "Use the existing wallpaper command API to send
 wake/sleep events to the wallpaper."

This reverts commit bde980759e036c53be6c2e40619fa13bf9ac052e.

Reason for revert: b/185615919

Change-Id: I4906f109de478361790e459c117bd5d6a88a778c
---
 core/java/android/app/IWallpaperManager.aidl  |  14 ---
 core/java/android/app/WallpaperManager.java   |  24 ----
 .../keyguard/WakefulnessLifecycle.java        | 103 +-----------------
 .../keyguard/WakefulnessLifecycleTest.java    |   6 +-
 .../statusbar/phone/StatusBarTest.java        |   5 +-
 .../wallpaper/WallpaperManagerService.java    |  40 -------
 6 files changed, 4 insertions(+), 188 deletions(-)

diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl
index 4f7c6841d6bb8..e83557c18f8f7 100644
--- a/core/java/android/app/IWallpaperManager.aidl
+++ b/core/java/android/app/IWallpaperManager.aidl
@@ -190,18 +190,4 @@ interface IWallpaperManager {
      * Called from SystemUI when it shows the AoD UI.
      */
     oneway void setInAmbientMode(boolean inAmbientMode, long animationDuration);
-
-    /**
-     * Called from SystemUI when the device is waking up.
-     *
-     * @hide
-     */
-    oneway void notifyWakingUp(int x, int y, in Bundle extras);
-
-    /**
-     * Called from SystemUI when the device is going to sleep.
-     *
-     * @hide
-     */
-    void notifyGoingToSleep(int x, int y, in Bundle extras);
 }
diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java
index 8d332ab1d58b5..6a71c92fbc37d 100644
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@@ -189,30 +189,6 @@ public class WallpaperManager {
      */
     public static final String COMMAND_DROP = "android.home.drop";
 
-    /**
-     * Command for {@link #sendWallpaperCommand}: reported by System UI when the device is waking
-     * up. The x and y arguments are a location (possibly very roughly) corresponding to the action
-     * that caused the device to wake up. For example, if the power button was pressed, this will be
-     * the location on the screen nearest the power button.
-     *
-     * If the location is unknown or not applicable, x and y will be -1.
-     *
-     * @hide
-     */
-    public static final String COMMAND_WAKING_UP = "android.wallpaper.wakingup";
-
-    /**
-     * Command for {@link #sendWallpaperCommand}: reported by System UI when the device is going to
-     * sleep. The x and y arguments are a location (possibly very roughly) corresponding to the
-     * action that caused the device to go to sleep. For example, if the power button was pressed,
-     * this will be the location on the screen nearest the power button.
-     *
-     * If the location is unknown or not applicable, x and y will be -1.
-     *
-     * @hide
-     */
-    public static final String COMMAND_GOING_TO_SLEEP = "android.wallpaper.goingtosleep";
-
     /**
      * Command for {@link #sendWallpaperCommand}: reported when the wallpaper that was already
      * set is re-applied by the user.
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java b/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java
index 1a94473f18d4b..de00d50b6e361 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java
@@ -17,20 +17,10 @@
 package com.android.systemui.keyguard;
 
 import android.annotation.IntDef;
-import android.app.IWallpaperManager;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.graphics.Point;
-import android.os.Bundle;
 import android.os.PowerManager;
-import android.os.RemoteException;
 import android.os.Trace;
-import android.util.DisplayMetrics;
-
-import androidx.annotation.Nullable;
 
 import com.android.systemui.Dumpable;
-import com.android.systemui.R;
 import com.android.systemui.dagger.SysUISingleton;
 
 import java.io.FileDescriptor;
@@ -41,7 +31,7 @@ import java.lang.annotation.RetentionPolicy;
 import javax.inject.Inject;
 
 /**
- * Tracks the wakefulness lifecycle, including why we're waking or sleeping.
+ * Tracks the wakefulness lifecycle.
  */
 @SysUISingleton
 public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observer> implements
@@ -61,30 +51,13 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe
     public static final int WAKEFULNESS_AWAKE = 2;
     public static final int WAKEFULNESS_GOING_TO_SLEEP = 3;
 
-    private final Context mContext;
-    private final DisplayMetrics mDisplayMetrics;
-    private final IWallpaperManager mWallpaperManagerService;
-
     private int mWakefulness = WAKEFULNESS_ASLEEP;
-
     private @PowerManager.WakeReason int mLastWakeReason = PowerManager.WAKE_REASON_UNKNOWN;
-
-    @Nullable
-    private Point mLastWakeOriginLocation = null;
-
     private @PowerManager.GoToSleepReason int mLastSleepReason =
             PowerManager.GO_TO_SLEEP_REASON_MIN;
 
-    @Nullable
-    private Point mLastSleepOriginLocation = null;
-
     @Inject
-    public WakefulnessLifecycle(
-            Context context,
-            @Nullable IWallpaperManager wallpaperManagerService) {
-        mContext = context;
-        mDisplayMetrics = context.getResources().getDisplayMetrics();
-        mWallpaperManagerService = wallpaperManagerService;
+    public WakefulnessLifecycle() {
     }
 
     public @Wakefulness int getWakefulness() {
@@ -112,15 +85,6 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe
         }
         setWakefulness(WAKEFULNESS_WAKING);
         mLastWakeReason = pmWakeReason;
-        updateLastWakeOriginLocation();
-
-        try {
-            mWallpaperManagerService.notifyWakingUp(
-                    mLastWakeOriginLocation.x, mLastWakeOriginLocation.y, new Bundle());
-        } catch (RemoteException e) {
-            e.printStackTrace();
-        }
-
         dispatch(Observer::onStartedWakingUp);
     }
 
@@ -138,15 +102,6 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe
         }
         setWakefulness(WAKEFULNESS_GOING_TO_SLEEP);
         mLastSleepReason = pmSleepReason;
-        updateLastSleepOriginLocation();
-
-        try {
-            mWallpaperManagerService.notifyGoingToSleep(
-                    mLastSleepOriginLocation.x, mLastSleepOriginLocation.y, new Bundle());
-        } catch (RemoteException e) {
-            e.printStackTrace();
-        }
-
         dispatch(Observer::onStartedGoingToSleep);
     }
 
@@ -169,60 +124,6 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe
         Trace.traceCounter(Trace.TRACE_TAG_APP, "wakefulness", wakefulness);
     }
 
-    private void updateLastWakeOriginLocation() {
-        mLastWakeOriginLocation = null;
-
-        switch (mLastWakeReason) {
-            case PowerManager.WAKE_REASON_POWER_BUTTON:
-                mLastWakeOriginLocation = getPowerButtonOrigin();
-                break;
-            default:
-                mLastWakeOriginLocation = getDefaultWakeSleepOrigin();
-                break;
-        }
-    }
-
-    private void updateLastSleepOriginLocation() {
-        mLastSleepOriginLocation = null;
-
-        switch (mLastSleepReason) {
-            case PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON:
-                mLastSleepOriginLocation = getPowerButtonOrigin();
-                break;
-            default:
-                mLastSleepOriginLocation = getDefaultWakeSleepOrigin();
-                break;
-        }
-    }
-
-    /**
-     * Returns the point on the screen closest to the physical power button.
-     */
-    private Point getPowerButtonOrigin() {
-        final boolean isPortrait = mContext.getResources().getConfiguration().orientation
-                == Configuration.ORIENTATION_PORTRAIT;
-
-        if (isPortrait) {
-            return new Point(
-                    mDisplayMetrics.widthPixels,
-                    mContext.getResources().getDimensionPixelSize(
-                            R.dimen.physical_power_button_center_screen_location_y));
-        } else {
-            return new Point(
-                    mContext.getResources().getDimensionPixelSize(
-                            R.dimen.physical_power_button_center_screen_location_y),
-                    mDisplayMetrics.heightPixels);
-        }
-    }
-
-    /**
-     * Returns the point on the screen used as the default origin for wake/sleep events. This is the
-     * middle-bottom of the screen.
-     */
-    private Point getDefaultWakeSleepOrigin() {
-        return new Point(mDisplayMetrics.widthPixels / 2, mDisplayMetrics.heightPixels);
-    }
-
     public interface Observer {
         default void onStartedWakingUp() {}
         default void onFinishedWakingUp() {}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/WakefulnessLifecycleTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/WakefulnessLifecycleTest.java
index 63ce98a170a6d..42e88b0f393d4 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/WakefulnessLifecycleTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/WakefulnessLifecycleTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import android.app.IWallpaperManager;
 import android.os.PowerManager;
 import android.testing.AndroidTestingRunner;
 
@@ -44,12 +43,9 @@ public class WakefulnessLifecycleTest extends SysuiTestCase {
     private WakefulnessLifecycle mWakefulness;
     private WakefulnessLifecycle.Observer mWakefulnessObserver;
 
-    private IWallpaperManager mWallpaperManager;
-
     @Before
     public void setUp() throws Exception {
-        mWallpaperManager = mock(IWallpaperManager.class);
-        mWakefulness = new WakefulnessLifecycle(mContext, mWallpaperManager);
+        mWakefulness = new WakefulnessLifecycle();
         mWakefulnessObserver = mock(WakefulnessLifecycle.Observer.class);
         mWakefulness.addObserver(mWakefulnessObserver);
     }
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
index 94144521c4d11..08d6d2d7c72d6 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
@@ -38,7 +38,6 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.app.IWallpaperManager;
 import android.app.Notification;
 import android.app.StatusBarManager;
 import android.app.trust.TrustManager;
@@ -266,7 +265,6 @@ public class StatusBarTest extends SysuiTestCase {
     @Mock private OngoingCallController mOngoingCallController;
     @Mock private TunerService mTunerService;
     @Mock private FeatureFlags mFeatureFlags;
-    @Mock private IWallpaperManager mWallpaperManager;
     private ShadeController mShadeController;
     private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock());
     private InitController mInitController = new InitController();
@@ -325,8 +323,7 @@ public class StatusBarTest extends SysuiTestCase {
 
         when(mRemoteInputManager.getController()).thenReturn(mRemoteInputController);
 
-        WakefulnessLifecycle wakefulnessLifecycle =
-                new WakefulnessLifecycle(mContext, mWallpaperManager);
+        WakefulnessLifecycle wakefulnessLifecycle = new WakefulnessLifecycle();
         wakefulnessLifecycle.dispatchStartedWakingUp(PowerManager.WAKE_REASON_UNKNOWN);
         wakefulnessLifecycle.dispatchFinishedWakingUp();
 
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 9acbdcc177ccf..89b7bbd450721 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2378,46 +2378,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
         }
     }
 
-    /**
-     * Propagate a wake event to the wallpaper engine.
-     */
-    public void notifyWakingUp(int x, int y, @NonNull Bundle extras) {
-        synchronized (mLock) {
-            final WallpaperData data = mWallpaperMap.get(mCurrentUserId);
-            data.connection.forEachDisplayConnector(
-                    displayConnector -> {
-                        if (displayConnector.mEngine != null) {
-                            try {
-                                displayConnector.mEngine.dispatchWallpaperCommand(
-                                        WallpaperManager.COMMAND_WAKING_UP, x, y, -1, extras);
-                            } catch (RemoteException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    });
-        }
-    }
-
-    /**
-     * Propagate a sleep event to the wallpaper engine.
-     */
-    public void notifyGoingToSleep(int x, int y, @NonNull Bundle extras) {
-        synchronized (mLock) {
-            final WallpaperData data = mWallpaperMap.get(mCurrentUserId);
-            data.connection.forEachDisplayConnector(
-                    displayConnector -> {
-                        if (displayConnector.mEngine != null) {
-                            try {
-                                displayConnector.mEngine.dispatchWallpaperCommand(
-                                        WallpaperManager.COMMAND_GOING_TO_SLEEP, x, y, -1, extras);
-                            } catch (RemoteException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    });
-        }
-    }
-
     @Override
     public boolean setLockWallpaperCallback(IWallpaperManagerCallback cb) {
         checkPermission(android.Manifest.permission.INTERNAL_SYSTEM_WINDOW);