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

Commit d0d2142c authored by Philip Junker's avatar Philip Junker Committed by Android (Google) Code Review
Browse files

Merge "Fix erroprone warnings" into main

parents 24da1c93 cec34b6e
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import com.android.server.policy.WindowManagerPolicy;
import com.android.server.power.batterysaver.BatterySaverController;
import com.android.server.power.batterysaver.BatterySaverPolicy;
import com.android.server.power.batterysaver.BatterySavingStats;
import com.android.server.power.stats.BatteryStatsImpl;
import com.android.server.statusbar.StatusBarManagerInternal;

import org.junit.Before;
@@ -78,7 +77,6 @@ public class NotifierTest {
    @Mock private AmbientDisplayConfiguration mAmbientDisplayConfigurationMock;
    @Mock private SystemPropertiesWrapper mSystemPropertiesMock;
    @Mock private InattentiveSleepWarningController mInattentiveSleepWarningControllerMock;
    @Mock private BatteryStatsImpl mBatteryStats;
    @Mock private Vibrator mVibrator;
    @Mock private StatusBarManagerInternal mStatusBarManagerInternal;

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ public class ShutdownCheckPointsTest {
    }

    /** Fake system dependencies for testing. */
    private final class TestInjector implements ShutdownCheckPoints.Injector {
    private static final class TestInjector implements ShutdownCheckPoints.Injector {
        private long mNow;
        private int mCheckPointsLimit;
        private int mDumpFilesLimit;
+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ public class WakeLockLogTest {
        return sw.toString();
    }

    public class TestInjector extends WakeLockLog.Injector {
    public static class TestInjector extends WakeLockLog.Injector {
        private final int mTagDatabaseSize;
        private final int mLogSize;