Merge "Change namespace for use_default_visibility_for_sensitive_inputs" into main (f181c056) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/LockPatternUtils.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
		import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
		import static android.security.Flags.shouldTrustManagerListenForPrimaryAuth;

		import static com.android.internal.widget.flags.Flags.useDefaultVisibilityForSensitiveInputs;
		import static com.android.internal.widget.flags.Flags.enableDefaultVisibilityForSensitiveInputs;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		@@ -1069,7 +1069,7 @@ public class LockPatternUtils {
		@UnsupportedAppUsage
		public boolean isVisiblePatternEnabled(int userId) {
		boolean defaultValue = true;
		if (useDefaultVisibilityForSensitiveInputs()) {
		if (enableDefaultVisibilityForSensitiveInputs()) {
		defaultValue =
		mContext.getResources()
		.getBoolean(
		@@ -1094,7 +1094,7 @@ public class LockPatternUtils {
		*/
		public boolean isPinEnhancedPrivacyEnabled(int userId) {
		boolean defaultValue = false;
		if (useDefaultVisibilityForSensitiveInputs()) {
		if (enableDefaultVisibilityForSensitiveInputs()) {
		defaultValue =
		mContext.getResources()
		.getBoolean(

core/java/com/android/internal/widget/flags.aconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@ flag {
		}

		flag {
		name: "use_default_visibility_for_sensitive_inputs"
		namespace: "input"
		name: "enable_default_visibility_for_sensitive_inputs"
		namespace: "systemui"
		description: "Allows setting default value for visibility of sensitive inputs (passowrd, pin and pattern)."
		bug: "339270220"
		metadata {

core/tests/coretests/src/com/android/internal/widget/LockPatternUtilsTest.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -469,7 +469,7 @@ public class LockPatternUtilsTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_USE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		@EnableFlags(Flags.FLAG_ENABLE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		public void isVisiblePatternEnabled_WhenConfigValueTrue() throws RemoteException {
		configureSensitiveInputVisibilityTest();
		when(mResources.getBoolean(com.android.internal.R.bool.config_lockPatternVisibleDefault))
		@@ -478,7 +478,7 @@ public class LockPatternUtilsTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_USE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		@EnableFlags(Flags.FLAG_ENABLE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		public void isVisiblePatternEnabled_WhenConfigValueFalse() throws RemoteException {
		configureSensitiveInputVisibilityTest();
		when(mResources.getBoolean(com.android.internal.R.bool.config_lockPatternVisibleDefault))
		@@ -487,14 +487,14 @@ public class LockPatternUtilsTest {
		}

		@Test
		@DisableFlags(Flags.FLAG_USE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		@DisableFlags(Flags.FLAG_ENABLE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		public void isVisiblePatternEnabled_OldDefault() throws RemoteException {
		configureSensitiveInputVisibilityTest();
		assertTrue(mLockPatternUtils.isVisiblePatternEnabled(USER_ID));
		}

		@Test
		@EnableFlags(Flags.FLAG_USE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		@EnableFlags(Flags.FLAG_ENABLE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		public void isPinEnhancedPrivacyEnabled_WhenConfigValueTrue() throws RemoteException {
		configureSensitiveInputVisibilityTest();
		when(mResources.getBoolean(
		@@ -504,7 +504,7 @@ public class LockPatternUtilsTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_USE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		@EnableFlags(Flags.FLAG_ENABLE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		public void isPinEnhancedPrivacyEnabled_WhenConfigValueFalse() throws RemoteException {
		configureSensitiveInputVisibilityTest();
		when(mResources.getBoolean(
		@@ -514,7 +514,7 @@ public class LockPatternUtilsTest {
		}

		@Test
		@DisableFlags(Flags.FLAG_USE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		@DisableFlags(Flags.FLAG_ENABLE_DEFAULT_VISIBILITY_FOR_SENSITIVE_INPUTS)
		public void isPinEnhancedPrivacyEnabled_OldDefault() throws RemoteException {
		configureSensitiveInputVisibilityTest();
		assertFalse(mLockPatternUtils.isPinEnhancedPrivacyEnabled(USER_ID));

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -6764,7 +6764,7 @@ public class SettingsProvider extends ContentProvider {

		if (currentVersion == 230) {
		if (com.android.internal.widget.flags.Flags
		.useDefaultVisibilityForSensitiveInputs()) {
		.enableDefaultVisibilityForSensitiveInputs()) {
		if (systemSettings
		.getSettingLocked(Settings.System.TEXT_SHOW_PASSWORD)
		.isNull()) {