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 am: 3d82cd5920

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23639288

Change-Id: I24b569392011ae5be2b61fdde0550f1c48ebdc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aurélien Pomini
2023-06-14 11:01:48 +00:00
committed by Automerger Merge Worker
parent ce06d1d4c4 3d82cd5920
commit ab65473b09
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.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.BLASTBufferQueue;
import android.graphics.Bitmap;
@@ -190,6 +191,9 @@ public abstract class WallpaperService extends Service {
private Handler mBackgroundHandler;
private HandlerThread mBackgroundThread;
// TODO (b/287037772) remove this flag and the forceReport argument in reportVisibility
private boolean mIsWearOs;
static final class WallpaperCommand {
String action;
int x;
@@ -2282,7 +2286,8 @@ public abstract class WallpaperService extends Service {
@Override
public void onDisplayChanged(int displayId) {
if (mDisplay.getDisplayId() == displayId) {
boolean forceReport = mDisplay.getState() != Display.STATE_DOZE_SUSPEND;
boolean forceReport = mIsWearOs
&& mDisplay.getState() != Display.STATE_DOZE_SUSPEND;
reportVisibility(forceReport);
}
}
@@ -2734,6 +2739,7 @@ public abstract class WallpaperService extends Service {
mBackgroundThread = new HandlerThread("DefaultWallpaperLocalColorExtractor");
mBackgroundThread.start();
mBackgroundHandler = new Handler(mBackgroundThread.getLooper());
mIsWearOs = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);
super.onCreate();
Trace.endSection();
}