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

This commit is contained in:
TreeHugger Robot
2016-10-21 17:23:42 +00:00
committed by Android (Google) Code Review

View File

@@ -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;