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

Commit 47e48b56 authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Automerger Merge Worker
Browse files

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

Merge "Only force wallpaper visibility events for wearOS" into udc-dev am: 3d82cd59 am: ab65473b

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



Change-Id: I1e80ddc3aaedc57bf7e0b7bab4fa61f3b82f3468
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d18b126 ab65473b

core/java/android/service/wallpaper/WallpaperService.java

+7 −1
Original line number Diff line number Diff line
@@ -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();

    }