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

Commit 448244b3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "add dream start/stop logs" into rvc-dev am: 8b5b71dd am: cb549069 

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

Change-Id: Iae0764427ace982a78de2246e866da7e747956a0
parents a56e2ccb cb549069

services/core/java/com/android/server/dreams/DreamManagerService.java

+35 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ import android.service.dreams.IDreamManager; 
import android.util.Slog;

import android.view.Display;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.UiEventLoggerImpl;

import com.android.internal.util.DumpUtils;

import com.android.server.FgThread;

import com.android.server.LocalServices;
@@ -77,6 +81,8 @@ public final class DreamManagerService extends SystemService { 
    private final PowerManagerInternal mPowerManagerInternal;

    private final PowerManager.WakeLock mDozeWakeLock;

    private final ActivityTaskManagerInternal mAtmInternal;

    private final UiEventLogger mUiEventLogger;

    private final ComponentName mAmbientDisplayComponent;



    private Binder mCurrentDreamToken;

    private ComponentName mCurrentDreamName;
@@ -91,6 +97,26 @@ public final class DreamManagerService extends SystemService { 


    private AmbientDisplayConfiguration mDozeConfig;



    @VisibleForTesting

    public enum DreamManagerEvent implements UiEventLogger.UiEventEnum {

        @UiEvent(doc = "The screensaver has started.")

        DREAM_START(577),



        @UiEvent(doc = "The screensaver has stopped.")

        DREAM_STOP(578);



        private final int mId;



        DreamManagerEvent(int id) {

            mId = id;

        }



        @Override

        public int getId() {

            return mId;

        }

    }



    public DreamManagerService(Context context) {

        super(context);

        mContext = context;
@@ -102,6 +128,9 @@ public final class DreamManagerService extends SystemService { 
        mAtmInternal = getLocalService(ActivityTaskManagerInternal.class);

        mDozeWakeLock = mPowerManager.newWakeLock(PowerManager.DOZE_WAKE_LOCK, TAG);

        mDozeConfig = new AmbientDisplayConfiguration(mContext);

        mUiEventLogger = new UiEventLoggerImpl();

        AmbientDisplayConfiguration adc = new AmbientDisplayConfiguration(mContext);

        mAmbientDisplayComponent = ComponentName.unflattenFromString(adc.ambientDisplayComponent());

    }



    @Override
@@ -388,6 +417,9 @@ public final class DreamManagerService extends SystemService { 
                .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "startDream");

        mHandler.post(wakeLock.wrap(() -> {

            mAtmInternal.notifyDreamStateChanged(true);

            if (!mCurrentDreamName.equals(mAmbientDisplayComponent)) {

                mUiEventLogger.log(DreamManagerEvent.DREAM_START);

            }

            mController.startDream(newToken, name, isTest, canDoze, userId, wakeLock);

        }));

    }
@@ -415,6 +447,9 @@ public final class DreamManagerService extends SystemService { 
    }



    private void cleanupDreamLocked() {

        if (!mCurrentDreamName.equals(mAmbientDisplayComponent)) {

            mUiEventLogger.log(DreamManagerEvent.DREAM_STOP);

        }

        mCurrentDreamToken = null;

        mCurrentDreamName = null;

        mCurrentDreamIsTest = false;