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

Merge "Change namespace for time_help_and_feedback_feature_supported server flag" into main

Browse Source
This commit is contained in:
Kanyinsola Fapohunda
2025-02-24 04:48:22 -08:00
committed by Android (Google) Code Review
parent 5e79d18636 c9569b1cbd
commit ca552d4e89
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/datetime/DateTimeLaunchUtils.java
View File

@@ -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);
}
}

6
tests/robotests/src/com/android/settings/datetime/TimeFeedbackPreferenceControllerTest.java
View File

@@ -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());