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

Commit c7afa45e authored by Kuan Wang's avatar Kuan Wang
Browse files

Clean up unused function getHideApplicationSummary in 

PowerUsageFeatureProvider.

Bug: 253395332
Bug: 254769892
Bug: 254769770
Test: make RunSettingsRoboTests
Change-Id: I6acf0cbdb7321934e85939e0acee567001107a17
parent eff9effb

src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ public class AppBatteryPreferenceController extends BasePreferenceController 
                    mBatteryDiffEntry,

                    Utils.formatPercentage(

                            mBatteryDiffEntry.getPercentOfTotal(), /* round */ true),

                    /*isValidToShowSummary=*/ true,

                    /*slotInformation=*/ null);

            return true;

        }

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

+3 −6
Original line number Diff line number Diff line
@@ -133,8 +133,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
    /** Launches battery details page for an individual battery consumer. */

    public static void startBatteryDetailPage(

            Activity caller, InstrumentedPreferenceFragment fragment,

            BatteryDiffEntry diffEntry, String usagePercent,

            boolean isValidToShowSummary, String slotInformation) {

            BatteryDiffEntry diffEntry, String usagePercent, String slotInformation) {

        final BatteryHistEntry histEntry = diffEntry.mBatteryHistEntry;

        final LaunchBatteryDetailPageArgs launchArgs = new LaunchBatteryDetailPageArgs();

        // configure the launch argument.
@@ -145,10 +144,8 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        launchArgs.mUid = (int) histEntry.mUid;

        launchArgs.mIconId = diffEntry.getAppIconId();

        launchArgs.mConsumedPower = (int) diffEntry.mConsumePower;

        launchArgs.mForegroundTimeMs =

            isValidToShowSummary ? diffEntry.mForegroundUsageTimeInMs : 0;

        launchArgs.mBackgroundTimeMs =

            isValidToShowSummary ? diffEntry.mBackgroundUsageTimeInMs : 0;

        launchArgs.mForegroundTimeMs = diffEntry.mForegroundUsageTimeInMs;

        launchArgs.mBackgroundTimeMs = diffEntry.mBackgroundUsageTimeInMs;

        launchArgs.mIsUserEntry = histEntry.isUserEntry();

        startBatteryDetailPage(caller, fragment, launchArgs);

    }

src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java

+0 −5
Original line number Diff line number Diff line
@@ -173,9 +173,4 @@ public interface PowerUsageFeatureProvider { 
     * Returns package names for hidding application in the usage screen.

     */

    CharSequence[] getHideApplicationEntries(Context context);



    /**

     * Returns package names for hidding summary in the usage screen.

     */

    CharSequence[] getHideApplicationSummary(Context context);

}

src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java

+0 −7
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.util.ArraySet; 
import android.util.SparseIntArray;



import com.android.internal.util.ArrayUtils;

import com.android.settings.R;

import com.android.settings.fuelgauge.batteryusage.BatteryHistEntry;

import com.android.settingslib.fuelgauge.Estimate;
@@ -190,10 +189,4 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider 
    public CharSequence[] getHideApplicationEntries(Context context) {

        return new CharSequence[0];

    }



    @Override

    public CharSequence[] getHideApplicationSummary(Context context) {

        return context.getResources().getTextArray(

                R.array.allowlist_hide_summary_in_battery_usage);

    }

}

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

+1 −29
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import com.android.settings.core.InstrumentedPreferenceFragment; 
import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;

import com.android.settings.fuelgauge.BatteryUtils;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -60,7 +59,6 @@ import com.android.settingslib.utils.StringUtil; 
import java.util.ArrayList;

import java.util.Comparator;

import java.util.List;

import java.util.Set;



/**

 * Controller that update the battery header view
@@ -85,7 +83,6 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro 
    private final PackageManager mPackageManager;

    private final SettingsActivity mActivity;

    private final InstrumentedPreferenceFragment mFragment;

    private final Set<CharSequence> mNotAllowShowSummaryPackages;

    private final String mPreferenceKey;



    private Context mPrefContext;
@@ -164,10 +161,6 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro 
        mPackageManager = context.getPackageManager();

        mActivity = activity;

        mFragment = fragment;

        mNotAllowShowSummaryPackages = Set.of(

                FeatureFactory.getFactory(context)

                        .getPowerUsageFeatureProvider(context)

                        .getHideApplicationSummary(context));

    }



    @Override
@@ -439,15 +432,9 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro 
        if (BatteryEntry.isSystemUid(entry.getUid())) {

            return;

        }

        String packageName = entry.getDefaultPackageName();

        if (packageName != null

                && mNotAllowShowSummaryPackages != null

                && mNotAllowShowSummaryPackages.contains(packageName)) {

            return;

        }

        // Only show summary when usage time is longer than one minute

        final long usageTimeMs = entry.getTimeInForegroundMs();

        if (shouldShowSummary(entry) && usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) {

        if (usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) {

            final CharSequence timeSequence =

                    StringUtil.formatElapsedTime(mContext, usageTimeMs, false, false);

            preference.setSummary(
@@ -470,21 +457,6 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro 
        }

    }



    private boolean shouldShowSummary(BatteryEntry entry) {

        final CharSequence[] allowlistPackages =

                FeatureFactory.getFactory(mContext)

                        .getPowerUsageFeatureProvider(mContext)

                        .getHideApplicationSummary(mContext);

        final String target = entry.getDefaultPackageName();



        for (CharSequence packageName : allowlistPackages) {

            if (TextUtils.equals(target, packageName)) {

                return false;

            }

        }

        return true;

    }



    private static boolean isSharedGid(int uid) {

        return UserHandle.getAppIdFromSharedAppGid(uid) > 0;

    }