Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea161147 authored by Jan Tomljanovic's avatar Jan Tomljanovic Committed by Android (Google) Code Review
Browse files

Merge "Flag cleanup for launched flag" into main

parents 714c6ded 3cd171e5

aconfig/settings_display_flag_declarations.aconfig

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
package: "com.android.settings.flags"

container: "system_ext"



flag {

    name: "protect_screen_timeout_with_auth"

    namespace: "safety_center"

    description: "Require an auth challenge for increasing screen timeout."

    bug: "315937886"

}

src/com/android/settings/display/ScreenTimeoutSettings.java

+1 −2
Original line number Diff line number Diff line
@@ -464,8 +464,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment 


        @Override

        public void onClick() {

            if (Flags.protectScreenTimeoutWithAuth()

                    && !mScreenTimeoutSettings.isUserAuthenticated()

            if (!mScreenTimeoutSettings.isUserAuthenticated()

                    && !isChecked()

                    && mTimeoutMs > getTimeoutFromKey(mScreenTimeoutSettings.getDefaultKey())) {

                WifiDppUtils.showLockScreen(

tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java

+0 −6
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.content.res.Resources;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.provider.SearchIndexableResource;
@@ -52,7 +51,6 @@ import android.provider.Settings; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.flags.Flags;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.widget.CandidateInfo;
@@ -313,7 +311,6 @@ public class ScreenTimeoutSettingsTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_PROTECT_SCREEN_TIMEOUT_WITH_AUTH)

    public void onClick_whenUserAlreadyAuthenticated_buttonChecked() {

        String key = "222";

        String defaultKey = "1";
@@ -331,7 +328,6 @@ public class ScreenTimeoutSettingsTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_PROTECT_SCREEN_TIMEOUT_WITH_AUTH)

    public void onClick_whenButtonAlreadyChecked_noAuthNeeded() {

        String key = "222";

        mSettings.setDefaultKey(key);
@@ -349,7 +345,6 @@ public class ScreenTimeoutSettingsTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_PROTECT_SCREEN_TIMEOUT_WITH_AUTH)

    public void onClick_whenReducingTimeout_noAuthNeeded() {

        String key = "1";

        String defaultKey = "222";
@@ -369,7 +364,6 @@ public class ScreenTimeoutSettingsTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_PROTECT_SCREEN_TIMEOUT_WITH_AUTH)

    public void onClick_whenIncreasingTimeout_authNeeded() {

        String key = "222";

        String defaultKey = "1";