diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index db9a8bd361d..69ae478499e 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -33,12 +33,12 @@ public interface PowerUsageFeatureProvider {
     /**
      * Check whether the battery usage button is enabled in the battery page
      */
-    boolean isBatteryUsageEnabled(Context context);
+    boolean isBatteryUsageEnabled();
 
     /**
      * Returns an allowlist of app names combined into the system-apps item
      */
-    List<String> getSystemAppsAllowlist(Context context);
+    List<String> getSystemAppsAllowlist();
 
     /**
      * Check whether location setting is enabled
@@ -135,25 +135,25 @@ public interface PowerUsageFeatureProvider {
     /**
      * Returns {@link Set} for the system component ids which are combined into others.
      */
-    Set<Integer> getOthersSystemComponentSet(Context context);
+    Set<Integer> getOthersSystemComponentSet();
 
     /**
      * Returns {@link Set} for hiding system component ids in the usage screen.
      */
-    Set<Integer> getHideSystemComponentSet(Context context);
+    Set<Integer> getHideSystemComponentSet();
 
     /**
      * Returns {@link Set} for hiding application package names in the usage screen.
      */
-    Set<CharSequence> getHideApplicationSet(Context context);
+    Set<String> getHideApplicationSet();
 
     /**
      * Returns {@link Set} for hiding applications background usage time.
      */
-    Set<CharSequence> getHideBackgroundUsageTimeSet(Context context);
+    Set<String> getHideBackgroundUsageTimeSet();
 
     /**
      * Returns {@link Set} for ignoring task root class names for screen on time.
      */
-    Set<CharSequence> getIgnoreScreenOnTimeTaskRootSet(Context context);
+    Set<String> getIgnoreScreenOnTimeTaskRootSet();
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index 06cb8bec90e..399d4782dd8 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -67,12 +67,12 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
     }
 
     @Override
-    public boolean isBatteryUsageEnabled(Context context) {
+    public boolean isBatteryUsageEnabled() {
         return true;
     }
 
     @Override
-    public List<String> getSystemAppsAllowlist(Context context) {
+    public List<String> getSystemAppsAllowlist() {
         return null;
     }
 
@@ -153,27 +153,27 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
     }
 
     @Override
-    public Set<Integer> getOthersSystemComponentSet(Context context) {
+    public Set<Integer> getOthersSystemComponentSet() {
         return new ArraySet<>();
     }
 
     @Override
-    public Set<Integer> getHideSystemComponentSet(Context context) {
+    public Set<Integer> getHideSystemComponentSet() {
         return new ArraySet<>();
     }
 
     @Override
-    public Set<CharSequence> getHideApplicationSet(Context context) {
+    public Set<String> getHideApplicationSet() {
         return new ArraySet<>();
     }
 
     @Override
-    public Set<CharSequence> getHideBackgroundUsageTimeSet(Context context) {
+    public Set<String> getHideBackgroundUsageTimeSet() {
         return new ArraySet<>();
     }
 
     @Override
-    public Set<CharSequence> getIgnoreScreenOnTimeTaskRootSet(Context context) {
+    public Set<String> getIgnoreScreenOnTimeTaskRootSet() {
         return new ArraySet<>();
     }
 }
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
index 97363e07489..8cb0c9bcc39 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -323,10 +323,10 @@ public final class DataProcessor {
         final List<AppUsageEvent> appUsageEventList = new ArrayList<>();
         long numEventsFetched = 0;
         long numAllEventsFetched = 0;
-        final Set<CharSequence> ignoreScreenOnTimeTaskRootSet =
+        final Set<String> ignoreScreenOnTimeTaskRootSet =
                 FeatureFactory.getFactory(context)
                         .getPowerUsageFeatureProvider(context)
-                        .getIgnoreScreenOnTimeTaskRootSet(context);
+                        .getIgnoreScreenOnTimeTaskRootSet();
         for (final long userId : usageEventsMap.keySet()) {
             final UsageEvents usageEvents = usageEventsMap.get(userId);
             while (usageEvents.hasNextEvent()) {
@@ -1691,15 +1691,15 @@ public final class DataProcessor {
         final Set<Integer> hideSystemComponentSet =
                 FeatureFactory.getFactory(context)
                         .getPowerUsageFeatureProvider(context)
-                        .getHideSystemComponentSet(context);
-        final Set<CharSequence> hideBackgroundUsageTimeSet =
+                        .getHideSystemComponentSet();
+        final Set<String> hideBackgroundUsageTimeSet =
                 FeatureFactory.getFactory(context)
                         .getPowerUsageFeatureProvider(context)
-                        .getHideBackgroundUsageTimeSet(context);
-        final Set<CharSequence> hideApplicationSet =
+                        .getHideBackgroundUsageTimeSet();
+        final Set<String> hideApplicationSet =
                 FeatureFactory.getFactory(context)
                         .getPowerUsageFeatureProvider(context)
-                        .getHideApplicationSet(context);
+                        .getHideApplicationSet();
         resultMap.keySet().forEach(dailyKey -> {
             final Map<Integer, BatteryDiffData> dailyUsageMap = resultMap.get(dailyKey);
             dailyUsageMap.values().forEach(batteryDiffData -> {
@@ -1727,8 +1727,8 @@ public final class DataProcessor {
     private static void purgeFakeAndHiddenPackages(
             final List<BatteryDiffEntry> entries,
             final Set<Integer> hideSystemComponentSet,
-            final Set<CharSequence> hideApplicationSet,
-            final Set<CharSequence> hideBackgroundUsageTimeSet) {
+            final Set<String> hideApplicationSet,
+            final Set<String> hideBackgroundUsageTimeSet) {
         final Iterator<BatteryDiffEntry> iterator = entries.iterator();
         while (iterator.hasNext()) {
             final BatteryDiffEntry entry = iterator.next();
@@ -1750,7 +1750,7 @@ public final class DataProcessor {
         final Set<Integer> othersSystemComponentSet =
                 FeatureFactory.getFactory(context)
                         .getPowerUsageFeatureProvider(context)
-                        .getOthersSystemComponentSet(context);
+                        .getOthersSystemComponentSet();
 
         BatteryDiffEntry.OthersBatteryDiffEntry othersDiffEntry = null;
         final Iterator<BatteryDiffEntry> systemListIterator =
@@ -1777,7 +1777,7 @@ public final class DataProcessor {
         final List<String> systemAppsAllowlist =
                 FeatureFactory.getFactory(context)
                         .getPowerUsageFeatureProvider(context)
-                        .getSystemAppsAllowlist(context);
+                        .getSystemAppsAllowlist();
         final Application application = (Application) context.getApplicationContext();
         final ApplicationsState applicationsState =
                 application == null ? null : ApplicationsState.getInstance(application);
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
index dea24317d46..0bec4908d10 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
@@ -256,7 +256,7 @@ public class PowerUsageSummary extends PowerUsageBase implements
         mBatteryUsagePreference = findPreference(KEY_BATTERY_USAGE);
         mBatteryUsagePreference.setSummary(getString(R.string.advanced_battery_preference_summary));
         mBatteryUsagePreference.setVisible(
-                mPowerFeatureProvider.isBatteryUsageEnabled(getContext()));
+                mPowerFeatureProvider.isBatteryUsageEnabled());
 
         mHelpPreference = findPreference(KEY_BATTERY_ERROR);
         mHelpPreference.setVisible(false);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index 4fbd695c767..9f62352b591 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -64,7 +64,7 @@ public class PowerUsageFeatureProviderImplTest {
 
     @Test
     public void testIsBatteryUsageEnabled_returnFalse() {
-        assertThat(mPowerFeatureProvider.isBatteryUsageEnabled(mContext)).isTrue();
+        assertThat(mPowerFeatureProvider.isBatteryUsageEnabled()).isTrue();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
index 054b44f01be..1c653290924 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
@@ -101,7 +101,7 @@ public final class BatteryChartPreferenceControllerTest {
         doReturn(resources).when(mContext).getResources();
         doReturn(Set.of("com.android.gms.persistent"))
                 .when(mFeatureFactory.powerUsageFeatureProvider)
-                .getHideApplicationSet(mContext);
+                .getHideApplicationSet();
         doReturn(mLayoutParams).when(mDailyChartView).getLayoutParams();
         doReturn(mIntent).when(mContext).registerReceiver(any(), any());
         doReturn(100).when(mIntent).getIntExtra(eq(BatteryManager.EXTRA_SCALE), anyInt());
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
index ba7650cda36..4204eaaf782 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
@@ -90,7 +90,7 @@ public final class BatteryUsageBreakdownControllerTest {
         doReturn(resources).when(mContext).getResources();
         doReturn(Set.of("com.android.gms.persistent"))
                 .when(mFeatureFactory.powerUsageFeatureProvider)
-                .getHideApplicationSet(mContext);
+                .getHideApplicationSet();
         mBatteryUsageBreakdownController = createController();
         mBatteryUsageBreakdownController.mAppListPreferenceGroup = mAppListPreferenceGroup;
         mBatteryDiffEntry = new BatteryDiffEntry(
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..d5e308f4a53 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
@@ -1237,7 +1237,7 @@ public final class DataProcessorTest {
         final List<Integer> levels = List.of(100, 100);
         hourlyBatteryLevelsPerDay.add(
                 new BatteryLevelData.PeriodBatteryLevelData(timestamps, levels));
-        when(mPowerUsageFeatureProvider.getHideApplicationSet(mContext))
+        when(mPowerUsageFeatureProvider.getHideApplicationSet())
                 .thenReturn(Set.of("package1"));
 
         final Map<Integer, Map<Integer, BatteryDiffData>> resultMap =
@@ -1330,7 +1330,7 @@ public final class DataProcessorTest {
         final List<Integer> levels = List.of(100, 100);
         hourlyBatteryLevelsPerDay.add(
                 new BatteryLevelData.PeriodBatteryLevelData(timestamps, levels));
-        when(mPowerUsageFeatureProvider.getHideBackgroundUsageTimeSet(mContext))
+        when(mPowerUsageFeatureProvider.getHideBackgroundUsageTimeSet())
                 .thenReturn(new HashSet(Arrays.asList((CharSequence) "package2")));
 
         final Map<Integer, Map<Integer, BatteryDiffData>> resultMap =