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

Commit f332c917 authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE Allow Wear Home app to send wallpaper commands at... 

Merge "RESTRICT AUTOMERGE Allow Wear Home app to send wallpaper commands at any time" into pi-wear-dev
parents 68cd9845 53ce10f2

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

+8 −1
Original line number Diff line number Diff line
@@ -386,7 +386,14 @@ class WallpaperController { 


    Bundle sendWindowWallpaperCommand(

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

        if (window == mWallpaperTarget || window == mPrevWallpaperTarget) {



        // 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 == mPrevWallpaperTarget) {

            boolean doWait = sync;

            for (int curTokenNdx = mWallpaperTokens.size() - 1; curTokenNdx >= 0; curTokenNdx--) {

                final WallpaperWindowToken token = mWallpaperTokens.get(curTokenNdx);