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

Merge "Remove call to set wakeLock WorkSource from VibrationThread constructor" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-03 16:08:48 +00:00
committed by Android (Google) Code Review
parent c3ea20b662 c7db2377f1
commit 0b6477d82f
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/vibrator/VibrationThread.java
View File

@@ -98,7 +98,7 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient {
} }
private final Object mLock = new Object(); private final Object mLock = new Object();
private final WorkSource mWorkSource = new WorkSource(); private final WorkSource mWorkSource;
private final PowerManager.WakeLock mWakeLock; private final PowerManager.WakeLock mWakeLock;
private final IBatteryStats mBatteryStatsService; private final IBatteryStats mBatteryStatsService;
private final VibrationSettings mVibrationSettings; private final VibrationSettings mVibrationSettings;
@@ -119,9 +119,8 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient {
mVibrationSettings = vibrationSettings; mVibrationSettings = vibrationSettings;
mDeviceEffectAdapter = effectAdapter; mDeviceEffectAdapter = effectAdapter;
mCallbacks = callbacks; mCallbacks = callbacks;
mWorkSource = new WorkSource(mVibration.uid);
mWakeLock = wakeLock; mWakeLock = wakeLock;
mWorkSource.set(vib.uid);
mWakeLock.setWorkSource(mWorkSource);
mBatteryStatsService = batteryStatsService; mBatteryStatsService = batteryStatsService;
CombinedVibration effect = vib.getEffect(); CombinedVibration effect = vib.getEffect();
@@ -152,6 +151,7 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient {
@Override @Override
public void run() { public void run() {
Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_DISPLAY); Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_DISPLAY);
mWakeLock.setWorkSource(mWorkSource);
mWakeLock.acquire(); mWakeLock.acquire();
try { try {
mVibration.token.linkToDeath(this, 0); mVibration.token.linkToDeath(this, 0);