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

Commit 2e827aa7 authored by Alex Salo's avatar Alex Salo Committed by Android (Google) Code Review
Browse files

Merge "Listen DeviceConfig changes in Attention"

parents 04e9a338 0d05b9ab

services/core/java/com/android/server/attention/AttentionManagerService.java

+46 −52
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.service.attention.AttentionService.ATTENTION_FAILURE_UNKNO 
import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityThread;

import android.attention.AttentionManagerInternal;

import android.attention.AttentionManagerInternal.AttentionCallbackInternal;

import android.content.BroadcastReceiver;
@@ -68,6 +69,7 @@ import com.android.server.SystemService; 
import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.Objects;

import java.util.Set;



/**

 * An attention service implementation that runs in System Server process.
@@ -81,21 +83,15 @@ public class AttentionManagerService extends SystemService { 
    /** Service will unbind if connection is not used for that amount of time. */

    private static final long CONNECTION_TTL_MILLIS = 60_000;



    /**

     * We cache the DeviceConfig values to avoid frequent ashmem-related checks; if the cached

     * values are stale for more than this duration we will update the cache.

     */

    @VisibleForTesting static final long DEVICE_CONFIG_MAX_STALENESS_MILLIS = 4 * 60 * 60 * 1000L;



    @VisibleForTesting long mLastReadDeviceConfigMillis = Long.MIN_VALUE;



    /** DeviceConfig flag name, if {@code true}, enables AttentionManagerService features. */

    private static final String KEY_SERVICE_ENABLED = "service_enabled";

    @VisibleForTesting

    static final String KEY_SERVICE_ENABLED = "service_enabled";



    /** Default value in absence of {@link DeviceConfig} override. */

    private static final boolean DEFAULT_SERVICE_ENABLED = true;



    private boolean mIsServiceEnabledCached;

    @VisibleForTesting

    boolean mIsServiceEnabled;



    /**

     * DeviceConfig flag name, describes how much time we consider a result fresh; if the check
@@ -108,7 +104,8 @@ public class AttentionManagerService extends SystemService { 
    @VisibleForTesting

    static final long DEFAULT_STALE_AFTER_MILLIS = 1_000;



    private long mStaleAfterMillisCached;

    @VisibleForTesting

    long mStaleAfterMillis;



    /** The size of the buffer that stores recent attention check results. */

    @VisibleForTesting
@@ -156,6 +153,11 @@ public class AttentionManagerService extends SystemService { 
        if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {

            mContext.registerReceiver(new ScreenStateReceiver(),

                    new IntentFilter(Intent.ACTION_SCREEN_OFF));



            readValuesFromDeviceConfig();

            DeviceConfig.addOnPropertiesChangedListener(NAMESPACE_ATTENTION_MANAGER_SERVICE,

                    ActivityThread.currentApplication().getMainExecutor(),

                    (properties) -> onDeviceConfigChange(properties.getKeyset()));

        }

    }
@@ -179,17 +181,9 @@ public class AttentionManagerService extends SystemService { 
        return mComponentName != null;

    }



    /**

     * Returns {@code true} if attention service is supported on this device.

     */

    @VisibleForTesting

    protected boolean isAttentionServiceSupported() {

        return isServiceEnabled();

    }



    private boolean isServiceEnabled() {

        ensureDeviceConfigCachedValuesFreshness();

        return mIsServiceEnabledCached;

    private boolean getIsServiceEnabled() {

        return DeviceConfig.getBoolean(NAMESPACE_ATTENTION_MANAGER_SERVICE, KEY_SERVICE_ENABLED,

                DEFAULT_SERVICE_ENABLED);

    }



    /**
@@ -198,39 +192,38 @@ public class AttentionManagerService extends SystemService { 
     */

    @VisibleForTesting

    protected long getStaleAfterMillis() {

        ensureDeviceConfigCachedValuesFreshness();

        return mStaleAfterMillisCached;

    }



    @VisibleForTesting

    protected void ensureDeviceConfigCachedValuesFreshness() {

        final long now = SystemClock.elapsedRealtime();

        final long whenBecomesStale =

                mLastReadDeviceConfigMillis + DEVICE_CONFIG_MAX_STALENESS_MILLIS;

        if (now < whenBecomesStale) {

            if (DEBUG) {

                Slog.d(LOG_TAG,

                        "Cached values are still fresh. Refreshed at=" + mLastReadDeviceConfigMillis

                                + ", now=" + now);

            }

            return;

        }



        mIsServiceEnabledCached = DeviceConfig.getBoolean(NAMESPACE_ATTENTION_MANAGER_SERVICE,

                KEY_SERVICE_ENABLED,

                DEFAULT_SERVICE_ENABLED);



        final long millis = DeviceConfig.getLong(NAMESPACE_ATTENTION_MANAGER_SERVICE,

                KEY_STALE_AFTER_MILLIS,

                DEFAULT_STALE_AFTER_MILLIS);



        if (millis < 0 || millis > 10_000) {

            Slog.w(LOG_TAG, "Bad flag value supplied for: " + KEY_STALE_AFTER_MILLIS);

            mStaleAfterMillisCached = DEFAULT_STALE_AFTER_MILLIS;

        } else {

            mStaleAfterMillisCached = millis;

            return DEFAULT_STALE_AFTER_MILLIS;

        }



        mLastReadDeviceConfigMillis = now;

        return millis;

    }



    private void onDeviceConfigChange(@NonNull Set<String> keys) {

        for (String key : keys) {

            switch (key) {

                case KEY_SERVICE_ENABLED:

                case KEY_STALE_AFTER_MILLIS:

                    readValuesFromDeviceConfig();

                    return;

                default:

                    Slog.i(LOG_TAG, "Ignoring change on " + key);

            }

        }

    }



    private void readValuesFromDeviceConfig() {

        mIsServiceEnabled = getIsServiceEnabled();

        mStaleAfterMillis = getStaleAfterMillis();



        Slog.i(LOG_TAG, "readValuesFromDeviceConfig():"

                + "\nmIsServiceEnabled=" + mIsServiceEnabled

                + "\nmStaleAfterMillis=" + mStaleAfterMillis);

    }



    /**
@@ -246,7 +239,7 @@ public class AttentionManagerService extends SystemService { 
    boolean checkAttention(long timeout, AttentionCallbackInternal callbackInternal) {

        Objects.requireNonNull(callbackInternal);



        if (!isAttentionServiceSupported()) {

        if (!mIsServiceEnabled) {

            Slog.w(LOG_TAG, "Trying to call checkAttention() on an unsupported device.");

            return false;

        }
@@ -272,7 +265,7 @@ public class AttentionManagerService extends SystemService { 
            // throttle frequent requests

            final AttentionCheckCache cache = mAttentionCheckCacheBuffer == null ? null

                    : mAttentionCheckCacheBuffer.getLast();

            if (cache != null && now < cache.mLastComputed + getStaleAfterMillis()) {

            if (cache != null && now < cache.mLastComputed + mStaleAfterMillis) {

                callbackInternal.onSuccess(cache.mResult, cache.mTimestamp);

                return true;

            }
@@ -379,7 +372,8 @@ public class AttentionManagerService extends SystemService { 


    private void dumpInternal(IndentingPrintWriter ipw) {

        ipw.println("Attention Manager Service (dumpsys attention) state:\n");

        ipw.println("isServiceEnabled=" + isServiceEnabled());

        ipw.println("isServiceEnabled=" + mIsServiceEnabled);

        ipw.println("mStaleAfterMillis=" + mStaleAfterMillis);

        ipw.println("AttentionServicePackageName=" + getServiceConfigPackage(mContext));

        ipw.println("Resolved component:");

        if (mComponentName != null) {
@@ -403,7 +397,7 @@ public class AttentionManagerService extends SystemService { 
    private final class LocalService extends AttentionManagerInternal {

        @Override

        public boolean isAttentionServiceSupported() {

            return AttentionManagerService.this.isAttentionServiceSupported();

            return AttentionManagerService.this.mIsServiceEnabled;

        }



        @Override

services/tests/servicestests/src/com/android/server/attention/AttentionManagerServiceTest.java

+2 −36
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.provider.DeviceConfig.NAMESPACE_ATTENTION_MANAGER_SERVICE; 


import static com.android.server.attention.AttentionManagerService.ATTENTION_CACHE_BUFFER_SIZE;

import static com.android.server.attention.AttentionManagerService.DEFAULT_STALE_AFTER_MILLIS;

import static com.android.server.attention.AttentionManagerService.DEVICE_CONFIG_MAX_STALENESS_MILLIS;

import static com.android.server.attention.AttentionManagerService.KEY_STALE_AFTER_MILLIS;



import static com.google.common.truth.Truth.assertThat;
@@ -40,7 +39,6 @@ import android.os.IPowerManager; 
import android.os.IThermalService;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.SystemClock;

import android.provider.DeviceConfig;

import android.service.attention.IAttentionCallback;

import android.service.attention.IAttentionService;
@@ -118,7 +116,7 @@ public class AttentionManagerServiceTest { 


    @Test

    public void testCheckAttention_returnFalseWhenPowerManagerNotInteract() throws RemoteException {

        doReturn(true).when(mSpyAttentionManager).isAttentionServiceSupported();

        mSpyAttentionManager.mIsServiceEnabled = true;

        doReturn(false).when(mMockIPowerManager).isInteractive();

        AttentionCallbackInternal callback = Mockito.mock(AttentionCallbackInternal.class);

        assertThat(mSpyAttentionManager.checkAttention(mTimeout, callback)).isFalse();
@@ -126,7 +124,7 @@ public class AttentionManagerServiceTest { 


    @Test

    public void testCheckAttention_callOnSuccess() throws RemoteException {

        doReturn(true).when(mSpyAttentionManager).isAttentionServiceSupported();

        mSpyAttentionManager.mIsServiceEnabled = true;

        doReturn(true).when(mSpyAttentionManager).isServiceAvailable();

        doReturn(true).when(mMockIPowerManager).isInteractive();

        doNothing().when(mSpyAttentionManager).freeIfInactiveLocked();
@@ -207,38 +205,6 @@ public class AttentionManagerServiceTest { 
                DEFAULT_STALE_AFTER_MILLIS);

    }



    @Test

    public void testEnsureDeviceConfigCachedValuesFreshness_doesNotCallDeviceConfigTooFrequently() {

        DeviceConfig.setProperty(NAMESPACE_ATTENTION_MANAGER_SERVICE,

                KEY_STALE_AFTER_MILLIS, String.valueOf(DEFAULT_STALE_AFTER_MILLIS), false);

        assertThat(mSpyAttentionManager.getStaleAfterMillis()).isEqualTo(

                DEFAULT_STALE_AFTER_MILLIS);



        DeviceConfig.setProperty(NAMESPACE_ATTENTION_MANAGER_SERVICE,

                KEY_STALE_AFTER_MILLIS, "123", false);



        // New value is ignored

        assertThat(mSpyAttentionManager.getStaleAfterMillis()).isEqualTo(

                DEFAULT_STALE_AFTER_MILLIS);

    }





    @Test

    public void testEnsureDeviceConfigCachedValuesFreshness_refreshesWhenStale() {

        DeviceConfig.setProperty(NAMESPACE_ATTENTION_MANAGER_SERVICE,

                KEY_STALE_AFTER_MILLIS, String.valueOf(DEFAULT_STALE_AFTER_MILLIS), false);

        assertThat(mSpyAttentionManager.getStaleAfterMillis()).isEqualTo(

                DEFAULT_STALE_AFTER_MILLIS);



        DeviceConfig.setProperty(NAMESPACE_ATTENTION_MANAGER_SERVICE,

                KEY_STALE_AFTER_MILLIS, "123", false);

        mSpyAttentionManager.mLastReadDeviceConfigMillis =

                SystemClock.elapsedRealtime() - (DEVICE_CONFIG_MAX_STALENESS_MILLIS + 1);



        // Values are refreshed

        assertThat(mSpyAttentionManager.getStaleAfterMillis()).isEqualTo(123);

    }



    private class MockIAttentionService implements IAttentionService {

        public void checkAttention(IAttentionCallback callback) throws RemoteException {

            callback.onSuccess(0, 0);