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

Commit 9d9caa8b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Supress errorprone warnings" into main am: ac03ab2a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3011982



Change-Id: I5aa1e495991d1b75a7059e03616984125411f7b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a8a420f ac03ab2a

services/core/java/com/android/server/power/stats/BatteryStatsImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

































services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java



+1
−0




























Original line number
Diff line number
Diff line








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