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

This commit is contained in:
Treehugger Robot
2024-05-27 08:45:53 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -27,7 +27,7 @@ import org.robolectric.RobolectricTestRunner;
public final class AppUsageEventEntityTest { public final class AppUsageEventEntityTest {
@Test @Test
public void testBuilder_returnsExpectedResult() { public void testBuilder_returnsExpectedResult() {
final long uid = 101L; final int uid = 101;
final long userId = 1001L; final long userId = 1001L;
final long timestamp = 10001L; final long timestamp = 10001L;
final int appUsageEventType = 1; final int appUsageEventType = 1;

View File

@@ -169,7 +169,7 @@ public class BatteryTestUtils {
Context context, long userId, long timestamp, String packageName, boolean multiple) { Context context, long userId, long timestamp, String packageName, boolean multiple) {
final AppUsageEventEntity entity = final AppUsageEventEntity entity =
new AppUsageEventEntity( new AppUsageEventEntity(
/* uid= */ 101L, /* uid= */ 101,
userId, userId,
timestamp, timestamp,
/* appUsageEventType= */ 2, /* appUsageEventType= */ 2,