From 813d12dd8c34c0c8231ed84b88c30ba956b68a08 Mon Sep 17 00:00:00 2001 From: Ilyas Sung Date: Thu, 1 Jun 2023 15:03:30 +0000 Subject: [PATCH] Migrate the setUsbDataSignalingEnabled api to the device policy engine. - Change isUsbDataSignalingEnabledForUser() to isUsbDataSignalingEnabled() Bug: 283934505 Test: Manual Test Change-Id: I1327eaadeb41b64041d722f81a7df5260035a1d1 --- .../usb/ConnectedUsbDeviceUpdaterTest.java | 3 +-- ...tUsbConfigurationPreferenceControllerTest.java | 12 ++++-------- .../UsbAudioRoutingPreferenceControllerTest.java | 15 +++++---------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java index 1b2ef9ac6e8..8d96c728338 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java @@ -82,8 +82,7 @@ public class ConnectedUsbDeviceUpdaterTest { @Test public void initUsbPreference_preferenceInit() { - when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser( - UserHandle.myUserId())).thenReturn(true); + when(mDevicePolicyManager.isUsbDataSignalingEnabled()).thenReturn(true); mDeviceUpdater.initUsbPreference(mContext); diff --git a/tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java index a386473020a..d14e1d871db 100644 --- a/tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java @@ -71,8 +71,7 @@ public class DefaultUsbConfigurationPreferenceControllerTest { @Test public void updateState_usbDataSignalingEnabled_shouldNotDisablePreference() { - when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser( - UserHandle.myUserId())).thenReturn(true); + when(mDevicePolicyManager.isUsbDataSignalingEnabled()).thenReturn(true); when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME); mController.updateState(mPreference); @@ -82,8 +81,7 @@ public class DefaultUsbConfigurationPreferenceControllerTest { @Test public void updateState_usbDataSignalingDisabled_shouldDisablePreference() { - when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser( - UserHandle.myUserId())).thenReturn(false); + when(mDevicePolicyManager.isUsbDataSignalingEnabled()).thenReturn(false); when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME); mController.updateState(mPreference); @@ -94,8 +92,7 @@ public class DefaultUsbConfigurationPreferenceControllerTest { @Test public void onDeveloperOptionsSwitchEnabled_usbEnabled_shouldNotDisablePreference() { - when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser( - UserHandle.myUserId())).thenReturn(true); + when(mDevicePolicyManager.isUsbDataSignalingEnabled()).thenReturn(true); when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME); mController.onDeveloperOptionsSwitchEnabled(); @@ -105,8 +102,7 @@ public class DefaultUsbConfigurationPreferenceControllerTest { @Test public void onDeveloperOptionsSwitchEnabled_usbDisabled_shouldDisablePreference() { - when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser( - UserHandle.myUserId())).thenReturn(false); + when(mDevicePolicyManager.isUsbDataSignalingEnabled()).thenReturn(false); when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME); mController.onDeveloperOptionsSwitchEnabled(); diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java index 69d2c99c0ab..cb0ba88f0f8 100644 --- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java @@ -75,8 +75,7 @@ public class UsbAudioRoutingPreferenceControllerTest { @Test public void updateState_usbAudioRoutingEnabled_shouldCheckedPreference() { - when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser( - UserHandle.myUserId())).thenReturn(true); + when(mDevicePolicyManager.isUsbDataSignalingEnabled()).thenReturn(true); when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, @@ -89,8 +88,7 @@ public class UsbAudioRoutingPreferenceControllerTest { @Test public void updateState_usbAudioRoutingDisabled_shouldUncheckedPreference() { - when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser( - UserHandle.myUserId())).thenReturn(true); + when(mDevicePolicyManager.isUsbDataSignalingEnabled()).thenReturn(true); when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, @@ -103,8 +101,7 @@ public class UsbAudioRoutingPreferenceControllerTest { @Test public void updateState_usbDataSignalingDisabled_shouldDisablePreference() { - when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser( - UserHandle.myUserId())).thenReturn(false); + when(mDevicePolicyManager.isUsbDataSignalingEnabled()).thenReturn(false); when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME); mController.updateState(mPreference); @@ -150,8 +147,7 @@ public class UsbAudioRoutingPreferenceControllerTest { @Test public void onDeveloperOptionsSwitchEnabled_usbEnabled_shouldNotDisablePreference() { - when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser( - UserHandle.myUserId())).thenReturn(true); + when(mDevicePolicyManager.isUsbDataSignalingEnabled()).thenReturn(true); when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME); mController.onDeveloperOptionsSwitchEnabled(); @@ -161,8 +157,7 @@ public class UsbAudioRoutingPreferenceControllerTest { @Test public void onDeveloperOptionsSwitchEnabled_usbDisabled_shouldDisablePreference() { - when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser( - UserHandle.myUserId())).thenReturn(false); + when(mDevicePolicyManager.isUsbDataSignalingEnabled()).thenReturn(false); when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME); mController.onDeveloperOptionsSwitchEnabled();