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

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

Merge "Fix potential deadlock with SensorObserver." into sc-v2-dev am: f00f998e 

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

Change-Id: I7eca194a94e2038f587cc66e51af1d0d9054b054
parents a5cef2c6 f00f998e

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;
@@ -621,10 +620,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);