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

Commit 2fb4a297 authored by Fengjiang Li's avatar Fengjiang Li Committed by Android (Google) Code Review
Browse files

Merge "Make WallpaperManager#sendWallpaperCommand onway" into main

parents 4bfdfa62 52bc904d

core/java/android/view/IWindowSession.aidl

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ interface IWindowSession { 
     */

    oneway void setWallpaperDisplayOffset(IBinder windowToken, int x, int y);



    Bundle sendWallpaperCommand(IBinder window, String action, int x, int y,

    oneway void sendWallpaperCommand(IBinder window, String action, int x, int y,

            int z, in Bundle extras, boolean sync);



    @UnsupportedAppUsage

core/java/android/view/WindowlessWindowManager.java

+1 −2
Original line number Diff line number Diff line
@@ -534,9 +534,8 @@ public class WindowlessWindowManager implements IWindowSession { 
    }



    @Override

    public android.os.Bundle sendWallpaperCommand(android.os.IBinder window,

    public void sendWallpaperCommand(android.os.IBinder window,

            java.lang.String action, int x, int y, int z, android.os.Bundle extras, boolean sync) {

        return null;

    }



    @Override

services/core/java/com/android/server/wm/Session.java

+2 −3
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { 
    }



    @Override

    public Bundle sendWallpaperCommand(IBinder window, String action, int x, int y,

    public void sendWallpaperCommand(IBinder window, String action, int x, int y,

            int z, Bundle extras, boolean sync) {

        synchronized (mService.mGlobalLock) {

            final long ident = Binder.clearCallingIdentity();
@@ -680,10 +680,9 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { 
                if (mCanAlwaysUpdateWallpaper

                        || windowState == wallpaperController.getWallpaperTarget()

                        || windowState == wallpaperController.getPrevWallpaperTarget()) {

                    return wallpaperController.sendWindowWallpaperCommandUnchecked(

                    wallpaperController.sendWindowWallpaperCommandUnchecked(

                            windowState, action, x, y, z, extras, sync);

                }

                return null;

            } finally {

                Binder.restoreCallingIdentity(ident);

            }

services/core/java/com/android/server/wm/WallpaperController.java

+1 −2
Original line number Diff line number Diff line
@@ -641,11 +641,10 @@ class WallpaperController { 
        }

    }



    Bundle sendWindowWallpaperCommandUnchecked(

    void sendWindowWallpaperCommandUnchecked(

            WindowState window, String action, int x, int y, int z,

            Bundle extras, boolean sync) {

        sendWindowWallpaperCommand(action, x, y, z, extras, sync);

        return null;

    }



    private void sendWindowWallpaperCommand(