Update logging: switch a bunch of action() logging calls.

Use generic action(int, int, int, String, int) instead of
action(Context, int, string, Pair...) when possible.

Bug: 117860032
Test: robotests
Change-Id: I5213b52b2b10d80a3c488c37718df81b3b0a428f

src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java

@@ -23,6 +23,7 @@ import android.app.Dialog;
 import android.app.admin.DeviceAdminInfo;
 import android.app.admin.DeviceAdminReceiver;
 import android.app.admin.DevicePolicyManager;
+import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -489,7 +490,12 @@ public class DeviceAdminAdd extends Activity {
     void logSpecialPermissionChange(boolean allow, String packageName) {
         int logCategory = allow ? MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_ALLOW :
                 MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_DENY;
-        FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, logCategory, packageName);
+        FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(
+                SettingsEnums.PAGE_UNKNOWN,
+                logCategory,
+                SettingsEnums.PAGE_UNKNOWN,
+                packageName,
+                0);
     }
 
     @Override

src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java

@@ -33,6 +33,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.AppInfoWithHeader;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 public class PictureInPictureDetails extends AppInfoWithHeader
         implements OnPreferenceChangeListener {
@@ -99,7 +100,7 @@ public class PictureInPictureDetails extends AppInfoWithHeader
 
     /**
      * @return whether the app associated with the given {@param packageName} is allowed to enter
-     *         picture-in-picture.
+     * picture-in-picture.
      */
     static boolean getEnterPipStateForPackage(Context context, int uid, String packageName) {
         final AppOpsManager appOps = context.getSystemService(AppOpsManager.class);
@@ -108,7 +109,7 @@ public class PictureInPictureDetails extends AppInfoWithHeader
 
     /**
      * @return the summary for the current state of whether the app associated with the given
-     *         {@param packageName} is allowed to enter picture-in-picture.
+     * {@param packageName} is allowed to enter picture-in-picture.
      */
     public static int getPreferenceSummary(Context context, int uid, String packageName) {
         final boolean enabled = PictureInPictureDetails.getEnterPipStateForPackage(context, uid,
@@ -122,7 +123,13 @@ public class PictureInPictureDetails extends AppInfoWithHeader
         int logCategory = newState
                 ? MetricsEvent.APP_PICTURE_IN_PICTURE_ALLOW
                 : MetricsEvent.APP_PICTURE_IN_PICTURE_DENY;
-        FeatureFactory.getFactory(getContext())
-                .getMetricsFeatureProvider().action(getContext(), logCategory, packageName);
+        final MetricsFeatureProvider metricsFeatureProvider =
+                FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider();
+        metricsFeatureProvider.action(
+                metricsFeatureProvider.getAttribution(getActivity()),
+                logCategory,
+                getMetricsCategory(),
+                packageName,
+                0);
     }
 }

src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java

@@ -44,6 +44,7 @@ import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.Callbacks;
 import com.android.settingslib.applications.ApplicationsState.Session;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.FooterPreference;
 
@@ -126,8 +127,15 @@ public class PremiumSmsAccess extends EmptyTextSettings
                 break;
         }
         if (category != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
-            FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(
-                    getContext(), category, packageName);
+            // TODO(117860032): Category is wrong. It should be defined in SettingsEnums.
+            final MetricsFeatureProvider metricsFeatureProvider =
+                    FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider();
+            metricsFeatureProvider.action(
+                    metricsFeatureProvider.getAttribution(getActivity()),
+                    category,
+                    getMetricsCategory(),
+                    packageName,
+                    smsState);
         }
     }
 
@@ -214,7 +222,7 @@ public class PremiumSmsAccess extends EmptyTextSettings
                 setIcon(mAppEntry.icon);
             }
             setEntries(R.array.security_settings_premium_sms_values);
-            setEntryValues(new CharSequence[] {
+            setEntryValues(new CharSequence[]{
                     String.valueOf(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER),
                     String.valueOf(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW),
                     String.valueOf(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW),

src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java

@@ -29,6 +29,7 @@ import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.utils.ManagedServiceSettings;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
@@ -73,8 +74,14 @@ public class VrListenerSettings extends ManagedServiceSettings {
     void logSpecialPermissionChange(boolean enable, String packageName) {
         int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_ALLOW
                 : MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_DENY;
-        FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
-                logCategory, packageName);
+        final MetricsFeatureProvider metricsFeatureProvider =
+                FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider();
+        metricsFeatureProvider.action(
+                metricsFeatureProvider.getAttribution(getActivity()),
+                logCategory,
+                getMetricsCategory(),
+                packageName,
+                0);
     }
 
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =