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

Commit 653b982d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at... 

Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
parents 4f8b640b b608d28f

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

+9 −1
Original line number Diff line number Diff line
@@ -346,7 +346,15 @@ class WallpaperController { 


    Bundle sendWindowWallpaperCommand(

            WindowState window, String action, int x, int y, int z, Bundle extras, boolean sync) {

        if (window == mWallpaperTarget



        // HACK(ewol): Custom whitelist for Wear Home app, to allow it to update the wallpaper

        // regardless of what window is targeted.

        // http://b/32172459

        final boolean hackWearWhitelisted = (window != null) && (window.mAttrs != null)

                && "com.google.android.wearable.app".equals(window.mAttrs.packageName);



        if (hackWearWhitelisted

                || window == mWallpaperTarget

                || window == mLowerWallpaperTarget

                || window == mUpperWallpaperTarget) {

            boolean doWait = sync;