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

Commit f8ad14ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Log screen dim event" into main

parents f154a120 6c18bcf9

services/core/java/com/android/server/power/Notifier.java

+3 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ public class Notifier { 
        mPolicy = policy;

        mFaceDownDetector = faceDownDetector;

        mScreenUndimDetector = screenUndimDetector;

        mWakefulnessSessionObserver = new WakefulnessSessionObserver(mContext, null);

        mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);

        mInputManagerInternal = LocalServices.getService(InputManagerInternal.class);

        mInputMethodManagerInternal = LocalServices.getService(InputMethodManagerInternal.class);
@@ -214,6 +213,7 @@ public class Notifier { 
        mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);

        mTrustManager = mContext.getSystemService(TrustManager.class);

        mVibrator = mContext.getSystemService(Vibrator.class);

        mWakefulnessSessionObserver = new WakefulnessSessionObserver(mContext, null);



        mHandler = new NotifierHandler(looper);

        mBackgroundExecutor = backgroundExecutor;
@@ -813,6 +813,8 @@ public class Notifier { 
        if (DEBUG) {

            Slog.d(TAG, "onScreenPolicyUpdate: newPolicy=" + newPolicy);

        }

        mWakefulnessSessionObserver.onScreenPolicyUpdate(

                SystemClock.uptimeMillis(), displayGroupId, newPolicy);



        synchronized (mLock) {

            Message msg = mHandler.obtainMessage(MSG_SCREEN_POLICY);

services/core/java/com/android/server/power/WakefulnessSessionObserver.java

+276 −9

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/power/WakefulnessSessionObserverTest.java

+208 −14

File changed.

Preview size limit exceeded, changes collapsed.