From d91809b752fb3de3a1760c8c79f9965704da3d7b Mon Sep 17 00:00:00 2001 From: Xinyi Mao Date: Tue, 28 May 2024 05:15:43 +0000 Subject: [PATCH] Revert "Fix atest build error in settings.fuelgauge." This reverts commit 3b962e3b9d865c919f34de2c46231439da040d77. Reason for revert: No need to update long -> int Change-Id: I060b57c5b8c871ccc938ca84fe1aa916293acada --- .../fuelgauge/batteryusage/db/AppUsageEventEntityTest.java | 2 +- .../src/com/android/settings/testutils/BatteryTestUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java index dc9b51d20d1..eb72b963e0b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java @@ -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; diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java index 10b17a7b862..915231f2573 100644 --- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java @@ -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,