Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Skip auth for USB func ctrl when unlocked in the last 60s

Browse Source 
Change-Id: I36e417b93e2e2481368f2fe84eaa4b5dafc3b74b
This commit is contained in:
Ido Ben-Hur
2025-01-09 17:24:27 +02:00
committed by Joey
parent 8d9c9c044a
commit 767a50a987
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
View File

@@ -32,6 +32,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.flags.Flags; import com.android.settings.flags.Flags;
import com.android.settings.wifi.dpp.WifiDppUtils;
import com.android.settingslib.widget.SelectorWithWidgetPreference; import com.android.settingslib.widget.SelectorWithWidgetPreference;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -46,6 +47,9 @@ public class UsbDetailsFunctionsController extends UsbDetailsController
private static final String TAG = "UsbFunctionsCtrl"; private static final String TAG = "UsbFunctionsCtrl";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private static final String USB_MODE_KEY_ALIAS = "usb_mode_auth_key";
private static final int MAX_UNLOCK_SECONDS = 60;
static final Map<Long, Integer> FUNCTIONS_MAP = new LinkedHashMap<>(); static final Map<Long, Integer> FUNCTIONS_MAP = new LinkedHashMap<>();
static { static {
@@ -173,12 +177,16 @@ public class UsbDetailsFunctionsController extends UsbDetailsController
} }
private boolean isAuthRequired(long function) { private boolean isAuthRequired(long function) {
if (!Flags.excludeWebcamAuthChallenge()) {
return true;
}
// Since webcam and MIDI don't transfer any persistent data over USB // Since webcam and MIDI don't transfer any persistent data over USB
// don't require authentication. // don't require authentication.
return !(function == UsbManager.FUNCTION_UVC || function == UsbManager.FUNCTION_MIDI); if (Flags.excludeWebcamAuthChallenge() &&
(function == UsbManager.FUNCTION_UVC || function == UsbManager.FUNCTION_MIDI)) {
return false;
}
if (WifiDppUtils.isUnlockedWithinSeconds(USB_MODE_KEY_ALIAS, MAX_UNLOCK_SECONDS)) {
return false;
}
return true;
} }
private boolean isClickEventIgnored(long function, long previousFunction) { private boolean isClickEventIgnored(long function, long previousFunction) {