Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-23 20:30:09 +00:00
committed by Android (Google) Code Review
parent e11f54565e ab7c9c0065
commit f00f998eb0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/display/DisplayModeDirector.java
View File

@@ -41,7 +41,6 @@ import android.os.IThermalEventListener;
import android.os.IThermalService; import android.os.IThermalService;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.PowerManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemClock; import android.os.SystemClock;
@@ -618,10 +617,11 @@ public class DisplayModeDirector {
mAppRequestObserver.dumpLocked(pw); mAppRequestObserver.dumpLocked(pw);
mBrightnessObserver.dumpLocked(pw); mBrightnessObserver.dumpLocked(pw);
mUdfpsObserver.dumpLocked(pw); mUdfpsObserver.dumpLocked(pw);
mSensorObserver.dumpLocked(pw);
mHbmObserver.dumpLocked(pw); mHbmObserver.dumpLocked(pw);
mSkinThermalStatusObserver.dumpLocked(pw); mSkinThermalStatusObserver.dumpLocked(pw);
} }
mSensorObserver.dump(pw);
} }
private void updateVoteLocked(int priority, Vote vote) { private void updateVoteLocked(int priority, Vote vote) {
@@ -2241,7 +2241,7 @@ public class DisplayModeDirector {
} }
} }
void dumpLocked(PrintWriter pw) { void dump(PrintWriter pw) {
pw.println(" SensorObserver"); pw.println(" SensorObserver");
synchronized (mSensorObserverLock) { synchronized (mSensorObserverLock) {
pw.println(" mIsProxActive=" + mIsProxActive); pw.println(" mIsProxActive=" + mIsProxActive);