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

Merge "Fix erroprone warnings" into main

Browse Source
This commit is contained in:
Philip Junker
2023-07-26 12:53:34 +00:00
committed by Android (Google) Code Review
parent 24da1c9381 cec34b6e1f
commit d0d2142c30
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java
View File

@@ -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;

2
services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java
View File

@@ -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;

2
services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java
View File

@@ -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;