From c9569b1cbdf626cf6579de5fe830f4515f02f4be Mon Sep 17 00:00:00 2001 From: Kanyinsola Fapohunda Date: Wed, 19 Feb 2025 07:09:49 -0800 Subject: [PATCH] Change namespace for time_help_and_feedback_feature_supported server flag This change moves the time_help_and_feedback_feature_supported flag from the settings_ui namespace to the system_time namespace. Flag: EXEMPT refactor Bug: 283239837 Change-Id: Ic1fcafd3cdbd263d7b800ac7676701628361de63 --- src/com/android/settings/datetime/DateTimeLaunchUtils.java | 4 ++-- .../datetime/TimeFeedbackPreferenceControllerTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/datetime/DateTimeLaunchUtils.java b/src/com/android/settings/datetime/DateTimeLaunchUtils.java index aef0ff2080b..f8cf0be2047 100644 --- a/src/com/android/settings/datetime/DateTimeLaunchUtils.java +++ b/src/com/android/settings/datetime/DateTimeLaunchUtils.java @@ -15,7 +15,7 @@ */ package com.android.settings.datetime; -import static android.provider.DeviceConfig.NAMESPACE_SETTINGS_UI; +import static android.provider.DeviceConfig.NAMESPACE_SYSTEM_TIME; import android.provider.DeviceConfig; @@ -47,6 +47,6 @@ final class DateTimeLaunchUtils { private static boolean isFeedbackFeatureSupportedOnThisDevice() { boolean defaultIsSupported = false; return DeviceConfig.getBoolean( - NAMESPACE_SETTINGS_UI, KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, defaultIsSupported); + NAMESPACE_SYSTEM_TIME, KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, defaultIsSupported); } } diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFeedbackPreferenceControllerTest.java index 196aa36d8de..6cbb14f2142 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFeedbackPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.datetime; -import static android.provider.DeviceConfig.NAMESPACE_SETTINGS_UI; +import static android.provider.DeviceConfig.NAMESPACE_SYSTEM_TIME; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; @@ -93,7 +93,7 @@ public class TimeFeedbackPreferenceControllerTest { @Test @EnableFlags({Flags.FLAG_DATETIME_FEEDBACK}) public void validIntentUri_targetHandlerNotFound_returnsConditionallyUnavailable() { - DeviceConfig.setProperty(NAMESPACE_SETTINGS_UI, + DeviceConfig.setProperty(NAMESPACE_SYSTEM_TIME, DateTimeLaunchUtils.KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, "true", true); when(mMockPackageManager.resolveActivity(any(), anyInt())).thenReturn(null); @@ -107,7 +107,7 @@ public class TimeFeedbackPreferenceControllerTest { @Test @EnableFlags({Flags.FLAG_DATETIME_FEEDBACK}) public void validIntentUri_targetHandlerAvailable_returnsAvailable() { - DeviceConfig.setProperty(NAMESPACE_SETTINGS_UI, + DeviceConfig.setProperty(NAMESPACE_SYSTEM_TIME, DateTimeLaunchUtils.KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, "true", true); when(mMockPackageManager.resolveActivity(any(), anyInt())).thenReturn( createDummyResolveInfo());