Merge "Remove feature flag for active unlock" into udc-dev

2023-05-09 17:17:11 +00:00
parent f4939a4bda 501f3635dc
commit 9c67ee1eb1
5 changed files with 6 additions and 81 deletions
--- a/tests/unit/src/com/android/settings/testutils/ActiveUnlockTestUtils.java
+++ b/tests/unit/src/com/android/settings/testutils/ActiveUnlockTestUtils.java
@@ -84,5 +84,7 @@ public final class ActiveUnlockTestUtils {
                ActiveUnlockStatusUtils.CONFIG_FLAG_NAME,
                null /* value */,
                false /* makeDefault */);
+        Settings.Secure.putString(context.getContentResolver(), TARGET_SETTING, null);
+        Settings.Secure.putString(context.getContentResolver(), PROVIDER_SETTING, null);
    }
 }