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

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

Merge "Flag cleanup of launched flag" into main

parents acb3464b c7705e70

aconfig/settings_security_flag_declarations.aconfig

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

container: "system_ext"



flag {

  name: "protect_lock_after_timeout_with_auth"

  namespace: "safety_center"

  description: "Require an auth challenge to open Lock after timeout page"

  bug: "315937886"

}

src/com/android/settings/security/screenlock/ProtectedTimeoutListPreference.java

+1 −6
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context; 
import android.util.AttributeSet;



import com.android.settings.display.TimeoutListPreference;

import com.android.settings.flags.Flags;

import com.android.settings.wifi.dpp.WifiDppUtils;



/** Wraps {@link TimeoutListPreference} with an authentication challenge for user. */
@@ -31,10 +30,6 @@ public class ProtectedTimeoutListPreference extends TimeoutListPreference { 


    @Override

    public void performClick() {

        if (Flags.protectLockAfterTimeoutWithAuth()) {

        WifiDppUtils.showLockScreen(getContext(), super::performClick);

        } else {

            super.performClick();

        }

    }

}