| commit | cec34b6e1f36bf1fd8c72e54d7e95bbb99891117 | [log] [tgz] |
|---|---|---|
| author | Philip Junker <philipjunker@google.com> | Tue Jul 25 14:36:18 2023 +0200 |
| committer | Philip Junker <philipjunker@google.com> | Tue Jul 25 14:37:43 2023 +0200 |
| tree | f317a695447b63d902475a544f4c43661d565bf5 | |
| parent | f09d89ab00b189b146a04c31d79207ac69e39287 [diff] |
Fix erroprone warnings Bug: 291742268 Test: atest PowerServiceTests Change-Id: I7ef4b251cb7548e4efdb31ee9deafee6e9db3ee9
diff --git a/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java b/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java index 2f03965..58cdb1b 100644 --- a/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java +++ b/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java
@@ -53,7 +53,6 @@ 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 @@ @Mock private AmbientDisplayConfiguration mAmbientDisplayConfigurationMock; @Mock private SystemPropertiesWrapper mSystemPropertiesMock; @Mock private InattentiveSleepWarningController mInattentiveSleepWarningControllerMock; - @Mock private BatteryStatsImpl mBatteryStats; @Mock private Vibrator mVibrator; @Mock private StatusBarManagerInternal mStatusBarManagerInternal;
diff --git a/services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java b/services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java index fe6cc28..67ed6b7 100644 --- a/services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java +++ b/services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java
@@ -366,7 +366,7 @@ } /** 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;
diff --git a/services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java b/services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java index 7af4b3d..0fad25d 100644 --- a/services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java +++ b/services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java
@@ -424,7 +424,7 @@ return sw.toString(); } - public class TestInjector extends WakeLockLog.Injector { + public static class TestInjector extends WakeLockLog.Injector { private final int mTagDatabaseSize; private final int mLogSize;