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

Commit 1360bec8 authored by YUKAI HUNG's avatar YUKAI HUNG Committed by Automerger Merge Worker
Browse files

Merge "Add package name into the metric for enable/disable app user actions"... 

Merge "Add package name into the metric for enable/disable app user actions" into sc-v2-dev am: 9fdeebf6 am: bb9225ee

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15808964

Change-Id: Ib738a56aa262fc4a93aaa6bf4841f4a45ecda0eb
parents c1e65d38 bb9225ee

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

+15 −3
Original line number Diff line number Diff line
@@ -226,7 +226,8 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp 
                uninstallDaIntent.putExtra(DeviceAdminAdd.EXTRA_DEVICE_ADMIN_PACKAGE_NAME,

                        packageName);

                mMetricsFeatureProvider.action(mActivity,

                        SettingsEnums.ACTION_SETTINGS_UNINSTALL_DEVICE_ADMIN);

                        SettingsEnums.ACTION_SETTINGS_UNINSTALL_DEVICE_ADMIN,

                        getPackageNameForMetric());

                mFragment.startActivityForResult(uninstallDaIntent, mRequestRemoveDeviceAdmin);

                return;

            }
@@ -253,7 +254,8 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp 
                            mActivity,

                            mAppEntry.info.enabled

                                    ? SettingsEnums.ACTION_SETTINGS_DISABLE_APP

                                    : SettingsEnums.ACTION_SETTINGS_ENABLE_APP);

                                    : SettingsEnums.ACTION_SETTINGS_ENABLE_APP,

                                    getPackageNameForMetric());

                    AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName,

                            PackageManager.COMPONENT_ENABLED_STATE_DEFAULT));

                }
@@ -270,7 +272,9 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp 
        @Override

        public void onClick(View v) {

             mMetricsFeatureProvider.action(

                     mActivity, SettingsEnums.ACTION_APP_INFO_FORCE_STOP);

                     mActivity,

                     SettingsEnums.ACTION_APP_INFO_FORCE_STOP,

                     getPackageNameForMetric());

            // force stop

            if (mPm.isPackageStateProtected(mAppEntry.info.packageName, mUserId)) {

                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mActivity,
@@ -757,6 +761,14 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp 
                || AppUtils.isMainlineModule(mPm, mAppEntry.info.packageName));

    }



    private String getPackageNameForMetric() {

        final String packageName =

                mAppEntry != null && mAppEntry.info != null

                        ? mAppEntry.info.packageName

                        : null;

        return packageName != null ? packageName : "";

    }



    /**

     * Changes the status of disable/enable for a package

     */