Merge "Migrate the setUsbDataSignalingEnabled api to the device policy engine."
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 1b2ef9a..8d96c72 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 @@
@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 a386473..d14e1d8 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 @@
@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 @@
@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 @@
@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 @@
@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 69d2c99..cb0ba88 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 @@
@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 @@
@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 @@
@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 @@
@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 @@
@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();