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

Commit 46183404 authored by Aurélien Pomini's avatar Aurélien Pomini
Browse files

Only force wallpaper visibility events for wearOS 

This puts the ag/21736290 logic under a isWearOs flag.

Visibility events should only be sent when there are actual visibility
changes, except for this specific wearOS case.

Bug: 285631818
Test: atest WallpaperManagerTest
Test: put logs and check visibility events
Change-Id: Icb63e3291c342fede3d601e084b192cb5a7d9b04
parent cceba8e2

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();

    }