From f8b9101314759fd9738ea2b7f73fd032a5146408 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Thu, 4 Feb 2021 04:57:47 +0000 Subject: [PATCH] Disable MTP transcoding by default BUG: 178769134 Test: manual Change-Id: Ib87d0f499bd699276326a41b37f42c7a85893afe --- .../connecteddevice/usb/UsbDetailsTranscodeMtpController.java | 3 ++- .../usb/UsbDetailsTranscodeMtpControllerTest.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java index bb91930f073..7ce8470bd0f 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java @@ -66,7 +66,8 @@ public class UsbDetailsTranscodeMtpController extends UsbDetailsController mFragment.getPreferenceScreen().removePreference(mPreferenceCategory); } - mSwitchPreference.setChecked(SystemProperties.getBoolean(TRANSCODE_MTP_SYS_PROP_KEY, true)); + mSwitchPreference.setChecked( + SystemProperties.getBoolean(TRANSCODE_MTP_SYS_PROP_KEY, false)); mPreferenceCategory.setEnabled( connected && isDeviceInFileTransferMode(functions, dataRole)); } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpControllerTest.java index 31fd13e064a..477b5926faa 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpControllerTest.java @@ -123,7 +123,7 @@ public class UsbDetailsTranscodeMtpControllerTest { mUnderTest.refresh(true /* connected */, UsbManager.FUNCTION_MTP, POWER_ROLE_NONE, DATA_ROLE_NONE); - assertThat(getSwitchPreference().isChecked()).isTrue(); + assertThat(getSwitchPreference().isChecked()).isFalse(); } @Test @@ -162,7 +162,7 @@ public class UsbDetailsTranscodeMtpControllerTest { mUnderTest.displayPreference(mScreen); getSwitchPreference().performClick(); getSwitchPreference().performClick(); - assertThat(SystemProperties.getBoolean(TRANSCODE_MTP_SYS_PROP_KEY, false)).isFalse(); + assertThat(SystemProperties.getBoolean(TRANSCODE_MTP_SYS_PROP_KEY, true)).isFalse(); } @Test