Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only force wallpaper visibility events for wearOS" into udc-dev

Browse Source
This commit is contained in:
Aurélien Pomini
2023-06-14 10:11:07 +00:00
committed by Android (Google) Code Review
parent b4b4f2042d 461834045b
commit 3d82cd5920
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -44,6 +44,7 @@ import android.app.WallpaperManager;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.BLASTBufferQueue; import android.graphics.BLASTBufferQueue;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@@ -190,6 +191,9 @@ public abstract class WallpaperService extends Service {
private Handler mBackgroundHandler; private Handler mBackgroundHandler;
private HandlerThread mBackgroundThread; private HandlerThread mBackgroundThread;
// TODO (b/287037772) remove this flag and the forceReport argument in reportVisibility
private boolean mIsWearOs;
static final class WallpaperCommand { static final class WallpaperCommand {
String action; String action;
int x; int x;
@@ -2282,7 +2286,8 @@ public abstract class WallpaperService extends Service {
@Override @Override
public void onDisplayChanged(int displayId) { public void onDisplayChanged(int displayId) {
if (mDisplay.getDisplayId() == displayId) { if (mDisplay.getDisplayId() == displayId) {
boolean forceReport = mDisplay.getState() != Display.STATE_DOZE_SUSPEND; boolean forceReport = mIsWearOs
&& mDisplay.getState() != Display.STATE_DOZE_SUSPEND;
reportVisibility(forceReport); reportVisibility(forceReport);
} }
} }
@@ -2734,6 +2739,7 @@ public abstract class WallpaperService extends Service {
mBackgroundThread = new HandlerThread("DefaultWallpaperLocalColorExtractor"); mBackgroundThread = new HandlerThread("DefaultWallpaperLocalColorExtractor");
mBackgroundThread.start(); mBackgroundThread.start();
mBackgroundHandler = new Handler(mBackgroundThread.getLooper()); mBackgroundHandler = new Handler(mBackgroundThread.getLooper());
mIsWearOs = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);
super.onCreate(); super.onCreate();
Trace.endSection(); Trace.endSection();
} }