Merge "Update log metrics in battery usage." into main

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

@@ -266,18 +266,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
         initHeader();
         mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
         initFooter();
-        mExecutor.execute(
-                () -> {
-                    final String packageName =
-                            BatteryUtils.getLoggingPackageName(
-                                    getContext(), mBatteryOptimizeUtils.getPackageName());
-                    FeatureFactory.getFeatureFactory()
-                            .getMetricsFeatureProvider()
-                            .action(
-                                    getContext(),
-                                    SettingsEnums.OPEN_APP_BATTERY_USAGE,
-                                    packageName);
-                });
         mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);
     }
 

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

@@ -110,18 +110,6 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
         initHeader();
         mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
         initFooter();
-        mExecutor.execute(
-                () -> {
-                    String packageName =
-                            BatteryUtils.getLoggingPackageName(
-                                    getContext(), mBatteryOptimizeUtils.getPackageName());
-                    FeatureFactory.getFeatureFactory()
-                            .getMetricsFeatureProvider()
-                            .action(
-                                    getContext(),
-                                    SettingsEnums.OPEN_POWER_USAGE_MANAGE_BACKGROUND,
-                                    packageName);
-                });
         mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);
     }
 

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

@@ -84,7 +84,7 @@ public class RestrictAppPreferenceController extends BasePreferenceController {
             RestrictedAppDetails.startRestrictedAppDetails(mPreferenceFragment, mAppInfos);
             FeatureFactory.getFeatureFactory()
                     .getMetricsFeatureProvider()
-                    .action(mContext, SettingsEnums.OPEN_APP_RESTRICTED_LIST);
+                    .action(mContext, SettingsEnums.ACTION_APP_RESTRICTED_LIST_MANAGED);
             return true;
         }