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

Commit 2550fb6d authored by Xinyi Mao's avatar Xinyi Mao Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix atest build error in settings.fuelgauge."" into main

parents 659e512b d91809b7

tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import org.robolectric.RobolectricTestRunner; 
public final class AppUsageEventEntityTest {

    @Test

    public void testBuilder_returnsExpectedResult() {

        final int uid = 101;

        final long uid = 101L;

        final long userId = 1001L;

        final long timestamp = 10001L;

        final int appUsageEventType = 1;

tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ public class BatteryTestUtils { 
            Context context, long userId, long timestamp, String packageName, boolean multiple) {

        final AppUsageEventEntity entity =

                new AppUsageEventEntity(

                        /* uid= */ 101,

                        /* uid= */ 101L,

                        userId,

                        timestamp,

                        /* appUsageEventType= */ 2,