PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix uninstalled app original uid should not be 0" into main

Browse Source
This commit is contained in:
YK Hung
2023-10-19 09:12:38 +00:00
committed by Android (Google) Code Review
parent 9a437cb696 28088dc64b
commit f0135418d0
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
View File

@@ -62,6 +62,8 @@ public final class BatteryDiffEntryTest {
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";
private static final String UID_ZERO_PACKAGE_NAME = "com.android.testing.uid.zero";
private Context mContext;
@@ -89,6 +91,9 @@ public final class BatteryDiffEntryTest {
doReturn(BatteryUtils.UID_NULL)
.when(mMockPackageManager)
.getPackageUid(UNINSTALLED_PACKAGE_NAME, PackageManager.GET_META_DATA);
doReturn(BatteryUtils.UID_ZERO)
.when(mMockPackageManager)
.getPackageUid(UID_ZERO_PACKAGE_NAME, PackageManager.GET_META_DATA);
BatteryDiffEntry.clearCache();
}
@@ -442,6 +447,18 @@ public final class BatteryDiffEntryTest {
assertThat(entry.isUninstalledEntry()).isFalse();
}
@Test
public void testIsUninstalledEntry_uidZero_returnFalse() throws Exception {
final ContentValues values =
getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
values.put(BatteryHistEntry.KEY_UID, BatteryUtils.UID_ZERO);
values.put(BatteryHistEntry.KEY_PACKAGE_NAME, PACKAGE_NAME);
final BatteryDiffEntry entry = createBatteryDiffEntry(10, new BatteryHistEntry(values));
assertThat(entry.isSystemEntry()).isFalse();
assertThat(entry.isUninstalledEntry()).isFalse();
}
@Test
public void testIsUninstalledEntry_uninstalledApp_returnTrue() throws Exception {
doReturn(BatteryUtils.UID_NULL)