From be1538671fe85752aabf0e1f3b42bf897a7f3565 Mon Sep 17 00:00:00 2001 From: Jun Lan Date: Mon, 25 Dec 2023 13:06:50 +0800 Subject: [PATCH] Fix test failure with package user id Context: https://android-build.corp.google.com/test_investigate/?invocationId=I73600010230800138&testResultId=TR57529105387126666 Bug: 315477872 Test: manual Change-Id: I8d0bd970bb43cc27b7f280c50cfcf4e3ea01f321 --- .../fuelgauge/batteryusage/BatteryDiffEntryTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java index 6f1dce64cb6..4567bc398d5 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java @@ -59,6 +59,7 @@ import java.util.Locale; public final class BatteryDiffEntryTest { private static final int UID = 100; + private static final int USER_ID = 0; private static final int UNINSTALLED_UID = 101; private static final String PACKAGE_NAME = "com.android.testing"; private static final String UNINSTALLED_PACKAGE_NAME = "com.android.testing.uninstalled"; @@ -87,13 +88,14 @@ public final class BatteryDiffEntryTest { doReturn(mMockPackageManager).when(mContext).getPackageManager(); doReturn(UID) .when(mMockPackageManager) - .getPackageUid(PACKAGE_NAME, PackageManager.GET_META_DATA); + .getPackageUidAsUser(PACKAGE_NAME, PackageManager.GET_META_DATA, USER_ID); doReturn(BatteryUtils.UID_NULL) .when(mMockPackageManager) - .getPackageUid(UNINSTALLED_PACKAGE_NAME, PackageManager.GET_META_DATA); + .getPackageUidAsUser( + UNINSTALLED_PACKAGE_NAME, PackageManager.GET_META_DATA, USER_ID); doReturn(BatteryUtils.UID_ZERO) .when(mMockPackageManager) - .getPackageUid(UID_ZERO_PACKAGE_NAME, PackageManager.GET_META_DATA); + .getPackageUidAsUser(UID_ZERO_PACKAGE_NAME, PackageManager.GET_META_DATA, USER_ID); BatteryDiffEntry.clearCache(); }