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

Commit 9e1b93fe authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Automerger Merge Worker
Browse files

Merge "Make screen events internal instead of AIDL" into udc-dev am:... 

Merge "Make screen events internal instead of AIDL" into udc-dev am: a9d7a0f0 am: 390d11e1 am: ace1062c am: 4a2da670

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



Change-Id: I4bf2315e9ce41c68a1f67c9511bfd75576bd82e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 637013ec 4a2da670

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()) {