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

Commit 0b6477d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents c3ea20b6 c7db2377

services/core/java/com/android/server/vibrator/VibrationThread.java

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient { 
    }



    private final Object mLock = new Object();

    private final WorkSource mWorkSource = new WorkSource();

    private final WorkSource mWorkSource;

    private final PowerManager.WakeLock mWakeLock;

    private final IBatteryStats mBatteryStatsService;

    private final VibrationSettings mVibrationSettings;
@@ -119,9 +119,8 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient { 
        mVibrationSettings = vibrationSettings;

        mDeviceEffectAdapter = effectAdapter;

        mCallbacks = callbacks;

        mWorkSource = new WorkSource(mVibration.uid);

        mWakeLock = wakeLock;

        mWorkSource.set(vib.uid);

        mWakeLock.setWorkSource(mWorkSource);

        mBatteryStatsService = batteryStatsService;



        CombinedVibration effect = vib.getEffect();
@@ -152,6 +151,7 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient { 
    @Override

    public void run() {

        Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_DISPLAY);

        mWakeLock.setWorkSource(mWorkSource);

        mWakeLock.acquire();

        try {

            mVibration.token.linkToDeath(this, 0);