diff options
| author | 2024-03-28 00:50:23 +0000 | |
|---|---|---|
| committer | 2024-03-28 00:50:23 +0000 | |
| commit | 9d9caa8b704d6ac05b0f0c4ae6a5ba3cd416d89d (patch) | |
| tree | ae23a389e12e8060fe8ecc6dbd4b23465290547d | |
| parent | 7a8a420f55359b3c5b559bb1db5d920909c35952 (diff) | |
| parent | ac03ab2a9ce3b9969f4e563df3305ed8f93b11b2 (diff) | |
Merge "Supress errorprone warnings" into main am: ac03ab2a9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3011982
Change-Id: I5aa1e495991d1b75a7059e03616984125411f7b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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); |