From 040b82800adba1ffade8bd43c6bbc8cf5b6d8358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Pomini?= <pomini@google.com>
Date: Mon, 1 May 2023 15:44:46 +0000
Subject: [PATCH] Make screen events internal instead of AIDL

Calls from WallpaperManagerInternal do not need to be IPC. This prevents
normal apps from being able to send fake screen events

Bug: 280419125
Test: atest WallpaperManagerTest
Change-Id: I47ea1db54d8ec2f2263ec90f864b182ef581051c
---
 core/java/android/app/IWallpaperManager.aidl       | 14 --------------
 .../server/wallpaper/WallpaperManagerService.java  |  8 ++------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl
index 2b1558937d217..ee242635bfb2f 100644
--- a/core/java/android/app/IWallpaperManager.aidl
+++ b/core/java/android/app/IWallpaperManager.aidl
@@ -219,20 +219,6 @@ interface IWallpaperManager {
      */
     void notifyGoingToSleep(int x, int y, in Bundle extras);
 
-    /**
-     * Called when the screen has been fully turned on and is visible.
-     *
-     * @hide
-     */
-    void notifyScreenTurnedOn(int displayId);
-
-    /**
-     * Called when the screen starts turning on.
-     *
-     * @hide
-     */
-    void notifyScreenTurningOn(int displayId);
-
     /**
      * Sets the wallpaper dim amount between [0f, 1f] which would be blended with the system default
      * dimming. 0f doesn't add any additional dimming and 1f makes the wallpaper fully black.
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index f73790686d25e..3e88caf507687 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2585,8 +2585,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
     /**
      * Propagates screen turned on event to wallpaper engine(s).
      */
-    @Override
-    public void notifyScreenTurnedOn(int displayId) {
+    private void notifyScreenTurnedOn(int displayId) {
         synchronized (mLock) {
             if (mIsLockscreenLiveWallpaperEnabled) {
                 for (WallpaperData data : getActiveWallpapers()) {
@@ -2621,13 +2620,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
         }
     }
 
-
-
     /**
      * Propagate screen turning on event to wallpaper engine(s).
      */
-    @Override
-    public void notifyScreenTurningOn(int displayId) {
+    private void notifyScreenTurningOn(int displayId) {
         synchronized (mLock) {
             if (mIsLockscreenLiveWallpaperEnabled) {
                 for (WallpaperData data : getActiveWallpapers()) {