diff options
| author | 2024-10-12 00:10:11 +0000 | |
|---|---|---|
| committer | 2024-10-14 16:32:05 +0000 | |
| commit | aad476af40acbb63473a7678f906078b8c7ee133 (patch) | |
| tree | 64ddb48ea6234118d4165d6847d25eb0b8e2e3a5 | |
| parent | 477d06b6b6e89c8f9926c1189b7ae739e7fdcbb5 (diff) | |
Updated StrongAuthTracker to use internal API with it's own disable reason.
Change-Id: I720c535b04f003118cfeec5c83c1e832b02adb4a
Test: atest UsbServiceTest
Flag: android.hardware.usb.flags.enable_usb_data_signal_staking_internal
Bug: 369382558
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbManagerInternal.java | 4 | ||||
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbService.java | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbManagerInternal.java b/services/usb/java/com/android/server/usb/UsbManagerInternal.java index c97df6b4f63a..31c5986c45b8 100644 --- a/services/usb/java/com/android/server/usb/UsbManagerInternal.java +++ b/services/usb/java/com/android/server/usb/UsbManagerInternal.java @@ -34,9 +34,11 @@ import java.lang.annotation.RetentionPolicy; public abstract class UsbManagerInternal { public static final int OS_USB_DISABLE_REASON_AAPM = 0; + public static final int OS_USB_DISABLE_REASON_LOCKDOWN_MODE = 1; @Retention(RetentionPolicy.SOURCE) - @IntDef(value = {OS_USB_DISABLE_REASON_AAPM}) + @IntDef(value = {OS_USB_DISABLE_REASON_AAPM, + OS_USB_DISABLE_REASON_LOCKDOWN_MODE}) public @interface OsUsbDisableReason { } diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java index ba9dff656f0a..ec4f7e1ea4ba 100644 --- a/services/usb/java/com/android/server/usb/UsbService.java +++ b/services/usb/java/com/android/server/usb/UsbService.java @@ -1527,8 +1527,11 @@ public class UsbService extends IUsbManager.Stub { } mLockdownModeStatus = lockDownTriggeredByUser; for (UsbPort port: mPortManager.getPorts()) { - enableUsbData(port.getId(), !lockDownTriggeredByUser, STRONG_AUTH_OPERATION_ID, - new IUsbOperationInternal.Default()); + enableUsbDataInternal(port.getId(), !lockDownTriggeredByUser, + STRONG_AUTH_OPERATION_ID, + new IUsbOperationInternal.Default(), + UsbManagerInternal.OS_USB_DISABLE_REASON_LOCKDOWN_MODE, + true); } } } |