Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92c1b3d5 authored by Manish Singh's avatar Manish Singh Committed by Android (Google) Code Review
Browse files

Merge "Disable MTP transcoding by default" into sc-dev

parents ce08013a f8b91013

src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java

+2 −1
Original line number Diff line number Diff line
@@ -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));

    }

tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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