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

Commit 9e83b479 authored by Santos Cordon's avatar Santos Cordon Committed by Android (Google) Code Review
Browse files

Merge "Fix potential deadlock with SensorObserver."

parents fe9b5be2 8f808c5d

services/core/java/com/android/server/display/DisplayModeDirector.java

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.os.IThermalEventListener; 
import android.os.IThermalService;

import android.os.Looper;

import android.os.Message;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;
@@ -619,10 +618,11 @@ public class DisplayModeDirector { 
            mAppRequestObserver.dumpLocked(pw);

            mBrightnessObserver.dumpLocked(pw);

            mUdfpsObserver.dumpLocked(pw);

            mSensorObserver.dumpLocked(pw);

            mHbmObserver.dumpLocked(pw);

            mSkinThermalStatusObserver.dumpLocked(pw);

        }



        mSensorObserver.dump(pw);

    }



    private void updateVoteLocked(int priority, Vote vote) {
@@ -2244,7 +2244,7 @@ public class DisplayModeDirector { 
            }

        }



        void dumpLocked(PrintWriter pw) {

        void dump(PrintWriter pw) {

            pw.println("  SensorObserver");

            synchronized (mSensorObserverLock) {

                pw.println("    mIsProxActive=" + mIsProxActive);