From d2572c3295b88f062ba937409f131f867eb7c14f Mon Sep 17 00:00:00 2001 From: jasonwshsu Date: Sat, 9 May 2020 05:34:59 +0800 Subject: [PATCH] Change to use ComponentName instead of String in log. * align framework log to use the same format in ag/11250012 Bug: 151285965 Test: manual test Change-Id: Ia76e3d88c116ffa37fb022aed2866acc0f315bd9 --- .../accessibility/AccessibilityStatsLogUtils.java | 13 ++++++------- ...unchAccessibilityActivityPreferenceFragment.java | 4 ++-- ...oggleAccessibilityServicePreferenceFragment.java | 4 ++-- .../ToggleColorInversionPreferenceFragment.java | 4 ++-- .../ToggleDaltonizerPreferenceFragment.java | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java b/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java index da889e980b3..d15988f6980 100644 --- a/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java +++ b/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java @@ -29,16 +29,15 @@ public final class AccessibilityStatsLogUtils { * Logs accessibility service name and its enabled status. Calls this when the user trigger * the accessibility service to be enabled/disabled. * - * @param packageName the package name of the service. Need to be the flattened {@link - * ComponentName} - * @param enabled {@code true} if the service is enabled + * @param componentName component name of the service + * @param enabled {@code true} if the service is enabled */ - static void logServiceStatus(String packageName, boolean enabled) { - SettingsStatsLog.write(SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED, packageName, - convertToLoggingServiceStatus(enabled)); + static void logAccessibilityServiceEnabled(ComponentName componentName, boolean enabled) { + SettingsStatsLog.write(SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED, + componentName.flattenToString(), convertToLoggingServiceEnabled(enabled)); } - private static int convertToLoggingServiceStatus(boolean enabled) { + private static int convertToLoggingServiceEnabled(boolean enabled) { return enabled ? SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED__SERVICE_STATUS__ENABLED : SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED__SERVICE_STATUS__DISABLED; } diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java index 40955cf5d0b..6078cc1e5a8 100644 --- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java +++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java @@ -16,7 +16,7 @@ package com.android.settings.accessibility; -import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logServiceStatus; +import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled; import android.accessibilityservice.AccessibilityShortcutInfo; import android.app.ActivityOptions; @@ -57,7 +57,7 @@ public class LaunchAccessibilityActivityPreferenceFragment extends @Override protected void onPreferenceToggled(String preferenceKey, boolean enabled) { - logServiceStatus(mComponentName.flattenToString(), enabled); + logAccessibilityServiceEnabled(mComponentName, enabled); launchShortcutTargetActivity(getPrefContext().getDisplayId(), mComponentName); } diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index d62ef29870e..05147a8889d 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -16,7 +16,7 @@ package com.android.settings.accessibility; -import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logServiceStatus; +import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; @@ -101,7 +101,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends @Override public void onPreferenceToggled(String preferenceKey, boolean enabled) { ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey); - logServiceStatus(toggledService.flattenToString(), enabled); + logAccessibilityServiceEnabled(toggledService, enabled); AccessibilityUtils.setAccessibilityServiceState(getPrefContext(), toggledService, enabled); } diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java index c4d7db98bda..defb621a29d 100644 --- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java @@ -17,7 +17,7 @@ package com.android.settings.accessibility; import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME; -import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logServiceStatus; +import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled; import static com.android.settings.accessibility.AccessibilityUtil.State.OFF; import static com.android.settings.accessibility.AccessibilityUtil.State.ON; @@ -54,7 +54,7 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere @Override protected void onPreferenceToggled(String preferenceKey, boolean enabled) { - logServiceStatus(mComponentName.flattenToString(), enabled); + logAccessibilityServiceEnabled(mComponentName, enabled); Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF); } diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 6b52c85623c..8a4b7f8824b 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -17,7 +17,7 @@ package com.android.settings.accessibility; import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME; -import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logServiceStatus; +import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled; import static com.android.settings.accessibility.AccessibilityUtil.State.OFF; import static com.android.settings.accessibility.AccessibilityUtil.State.ON; @@ -168,7 +168,7 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe @Override protected void onPreferenceToggled(String preferenceKey, boolean enabled) { - logServiceStatus(mComponentName.flattenToString(), enabled); + logAccessibilityServiceEnabled(mComponentName, enabled); Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF); }