Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a358384 authored by Zaiyue Xue's avatar Zaiyue Xue
Browse files

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

This reverts commit 814eff1c.

Reason for revert: The original logic is right.

Change-Id: I2aee0f9ab13c60d843e91056de9d409a1d84b9d4
parent 814eff1c

src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

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

+2 −3
Original line number Diff line number Diff line
@@ -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);