From 814eff1c24b66e6e1acc5e6c25ae1a579c7aeee7 Mon Sep 17 00:00:00 2001 From: Zaiyue Xue Date: Fri, 6 Jan 2023 15:24:44 +0800 Subject: [PATCH] Fix the inverted logic to judge whether an app is system app. Bug: 264626206 Fix: 264626206 Test: maunal Change-Id: I3750e3b11e444add27243c492cf8968373cd57d0 --- .../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 649adbe8069..9659d3cbd8f 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java +++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java @@ -1826,8 +1826,7 @@ 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 a1caa2c88a9..7cf80169b8d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java @@ -1660,7 +1660,8 @@ public final class DataProcessorTest { batteryHistEntry); doReturn(mAppEntry).when(mApplicationsState).getEntry(anyString(), anyInt()); mAppEntry.info = mApplicationInfo; - mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM; + mApplicationInfo.flags = + ApplicationInfo.FLAG_SYSTEM | ApplicationInfo.FLAG_UPDATED_SYSTEM_APP; boolean needsCombineInSystemApp = DataProcessor.needsCombineInSystemApp( batteryDiffEntry, List.of(), mApplicationsState); @@ -1690,7 +1691,7 @@ public final class DataProcessorTest { batteryHistEntry); doReturn(mAppEntry).when(mApplicationsState).getEntry(anyString(), anyInt()); mAppEntry.info = mApplicationInfo; - mApplicationInfo.flags = 0; + mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM; boolean needsCombineInSystemApp = DataProcessor.needsCombineInSystemApp( batteryDiffEntry, List.of(), mApplicationsState);