From 9a35838436c116d8c42c30b9290b6d6e9e565414 Mon Sep 17 00:00:00 2001 From: Zaiyue Xue Date: Mon, 9 Jan 2023 07:29:30 +0000 Subject: [PATCH] Revert "Fix the inverted logic to judge whether an app is system app." This reverts commit 814eff1c24b66e6e1acc5e6c25ae1a579c7aeee7. Reason for revert: The original logic is right. Change-Id: I2aee0f9ab13c60d843e91056de9d409a1d84b9d4 --- .../settings/fuelgauge/batteryusage/DataProcessor.java | 3 ++- .../settings/fuelgauge/batteryusage/DataProcessorTest.java | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java index 9659d3cbd8f..649adbe8069 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java +++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java @@ -1826,7 +1826,8 @@ public final class DataProcessor { if (appEntry == null || appEntry.info == null) { 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) { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java index 7cf80169b8d..a1caa2c88a9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java @@ -1660,8 +1660,7 @@ public final class DataProcessorTest { batteryHistEntry); doReturn(mAppEntry).when(mApplicationsState).getEntry(anyString(), anyInt()); mAppEntry.info = mApplicationInfo; - mApplicationInfo.flags = - ApplicationInfo.FLAG_SYSTEM | ApplicationInfo.FLAG_UPDATED_SYSTEM_APP; + mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM; boolean needsCombineInSystemApp = DataProcessor.needsCombineInSystemApp( batteryDiffEntry, List.of(), mApplicationsState); @@ -1691,7 +1690,7 @@ public final class DataProcessorTest { batteryHistEntry); doReturn(mAppEntry).when(mApplicationsState).getEntry(anyString(), anyInt()); mAppEntry.info = mApplicationInfo; - mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM; + mApplicationInfo.flags = 0; boolean needsCombineInSystemApp = DataProcessor.needsCombineInSystemApp( batteryDiffEntry, List.of(), mApplicationsState);