diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-28 00:35:51 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-28 00:35:51 +0000 |
commit | ac03ab2a9ce3b9969f4e563df3305ed8f93b11b2 (patch) | |
tree | ae23a389e12e8060fe8ecc6dbd4b23465290547d | |
parent | d07b6794073068cc925290a74bf483a4dc137741 (diff) | |
parent | a88e319b0b1b50dd811bbfea0165775024df4545 (diff) | |
download | base-ac03ab2a9ce3b9969f4e563df3305ed8f93b11b2.tar.gz |
Merge "Supress errorprone warnings" into main
-rw-r--r-- | services/core/java/com/android/server/power/stats/BatteryStatsImpl.java | 1 | ||||
-rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java index 698f6ea4b443..4eea8c62822e 100644 --- a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java +++ b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java @@ -3708,6 +3708,7 @@ public class BatteryStatsImpl extends BatteryStats { public abstract T instantiateObject(); } + @SuppressWarnings("ParcelableCreator") public static class ControllerActivityCounterImpl extends ControllerActivityCounter implements Parcelable { private final Clock mClock; diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java index 55a00fc0ec89..48fc2dc4bada 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java @@ -799,6 +799,7 @@ public class WindowContainerTests extends WindowTestsBase { verify(child).onConfigurationChanged(any()); } + @SuppressWarnings("SelfComparison") @Test public void testCompareTo() { final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(mWm); |