PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change to use ComponentName instead of String in log.

Browse Source 
* align framework log to use the same format in ag/11250012

Bug: 151285965
Test: manual test
Change-Id: Ia76e3d88c116ffa37fb022aed2866acc0f315bd9
This commit is contained in:
jasonwshsu
2020-05-09 05:34:59 +08:00
parent e76f541f7c
commit d2572c3295
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java
View File

@@ -29,16 +29,15 @@ public final class AccessibilityStatsLogUtils {
* Logs accessibility service name and its enabled status. Calls this when the user trigger * Logs accessibility service name and its enabled status. Calls this when the user trigger
* the accessibility service to be enabled/disabled. * the accessibility service to be enabled/disabled.
* *
* @param packageName the package name of the service. Need to be the flattened {@link * @param componentName component name of the service
* ComponentName}
* @param enabled {@code true} if the service is enabled * @param enabled {@code true} if the service is enabled
*/ */
static void logServiceStatus(String packageName, boolean enabled) { static void logAccessibilityServiceEnabled(ComponentName componentName, boolean enabled) {
SettingsStatsLog.write(SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED, packageName, SettingsStatsLog.write(SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED,
convertToLoggingServiceStatus(enabled)); 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 return enabled ? SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED__SERVICE_STATUS__ENABLED
: SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED__SERVICE_STATUS__DISABLED; : SettingsStatsLog.ACCESSIBILITY_SERVICE_REPORTED__SERVICE_STATUS__DISABLED;
} }

4
src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.accessibility; 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.accessibilityservice.AccessibilityShortcutInfo;
import android.app.ActivityOptions; import android.app.ActivityOptions;
@@ -57,7 +57,7 @@ public class LaunchAccessibilityActivityPreferenceFragment extends
@Override @Override
protected void onPreferenceToggled(String preferenceKey, boolean enabled) { protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
logServiceStatus(mComponentName.flattenToString(), enabled); logAccessibilityServiceEnabled(mComponentName, enabled);
launchShortcutTargetActivity(getPrefContext().getDisplayId(), mComponentName); launchShortcutTargetActivity(getPrefContext().getDisplayId(), mComponentName);
} }

4
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.accessibility; 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.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity; import android.app.Activity;
@@ -101,7 +101,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends
@Override @Override
public void onPreferenceToggled(String preferenceKey, boolean enabled) { public void onPreferenceToggled(String preferenceKey, boolean enabled) {
ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey); ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
logServiceStatus(toggledService.flattenToString(), enabled); logAccessibilityServiceEnabled(toggledService, enabled);
AccessibilityUtils.setAccessibilityServiceState(getPrefContext(), toggledService, enabled); AccessibilityUtils.setAccessibilityServiceState(getPrefContext(), toggledService, enabled);
} }

4
src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
View File

@@ -17,7 +17,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME; 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.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON; import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
@@ -54,7 +54,7 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
@Override @Override
protected void onPreferenceToggled(String preferenceKey, boolean enabled) { protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
logServiceStatus(mComponentName.flattenToString(), enabled); logAccessibilityServiceEnabled(mComponentName, enabled);
Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF); Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF);
} }

4
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

@@ -17,7 +17,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME; 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.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON; import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
@@ -168,7 +168,7 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe
@Override @Override
protected void onPreferenceToggled(String preferenceKey, boolean enabled) { protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
logServiceStatus(mComponentName.flattenToString(), enabled); logAccessibilityServiceEnabled(mComponentName, enabled);
Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF); Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF);
} }