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

Commit 040b8280 authored by Aurélien Pomini's avatar Aurélien Pomini
Browse files

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
parent 18227c30

core/java/android/app/IWallpaperManager.aidl

+0 −14
Original line number Diff line number Diff line
@@ -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.

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+2 −6
Original line number Diff line number Diff line
@@ -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()) {