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

2024-05-27 08:45:53 +00:00
parent d029d32ff3 3b962e3b9d
commit 75bfd43513
2 changed files with 2 additions and 2 deletions
--- 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 long uid = 101L;
+        final int uid = 101;
        final long userId = 1001L;
        final long timestamp = 10001L;
        final int appUsageEventType = 1;
--- 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= */ 101L,
+                        /* uid= */ 101,
                        userId,
                        timestamp,
                        /* appUsageEventType= */ 2,