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

Revert "Fix the inverted logic to judge whether an app is system app."

Browse Source 
This reverts commit 814eff1c24.

Reason for revert: The original logic is right.

Change-Id: I2aee0f9ab13c60d843e91056de9d409a1d84b9d4
This commit is contained in:
Zaiyue Xue
2023-01-09 07:29:30 +00:00
parent 814eff1c24
commit 9a35838436
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
View File

@@ -1826,7 +1826,8 @@ public final class DataProcessor {
if (appEntry == null || appEntry.info == null) { if (appEntry == null || appEntry.info == null) {
return false; return false;
} }
return ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER_AND_INSTANT.filterApp(appEntry); return !ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER_AND_INSTANT.filterApp(
appEntry);
} }
private static boolean shouldShowBatteryAttributionList(final Context context) { private static boolean shouldShowBatteryAttributionList(final Context context) {

5
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
View File

@@ -1660,8 +1660,7 @@ public final class DataProcessorTest {
batteryHistEntry); batteryHistEntry);
doReturn(mAppEntry).when(mApplicationsState).getEntry(anyString(), anyInt()); doReturn(mAppEntry).when(mApplicationsState).getEntry(anyString(), anyInt());
mAppEntry.info = mApplicationInfo; mAppEntry.info = mApplicationInfo;
mApplicationInfo.flags = mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
ApplicationInfo.FLAG_SYSTEM | ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
boolean needsCombineInSystemApp = DataProcessor.needsCombineInSystemApp( boolean needsCombineInSystemApp = DataProcessor.needsCombineInSystemApp(
batteryDiffEntry, List.of(), mApplicationsState); batteryDiffEntry, List.of(), mApplicationsState);
@@ -1691,7 +1690,7 @@ public final class DataProcessorTest {
batteryHistEntry); batteryHistEntry);
doReturn(mAppEntry).when(mApplicationsState).getEntry(anyString(), anyInt()); doReturn(mAppEntry).when(mApplicationsState).getEntry(anyString(), anyInt());
mAppEntry.info = mApplicationInfo; mAppEntry.info = mApplicationInfo;
mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM; mApplicationInfo.flags = 0;
boolean needsCombineInSystemApp = DataProcessor.needsCombineInSystemApp( boolean needsCombineInSystemApp = DataProcessor.needsCombineInSystemApp(
batteryDiffEntry, List.of(), mApplicationsState); batteryDiffEntry, List.of(), mApplicationsState);