PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable MTP transcoding by default" into sc-dev am: 92c1b3d5d3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13476372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7535d284e8aea0ddca51b289cc6ca5bf2e811e15
This commit is contained in:
Manish Singh
2021-02-05 19:26:31 +00:00
committed by Automerger Merge Worker
parent 0e018cafa4 92c1b3d5d3
commit 0a82da1759
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
View File

@@ -66,7 +66,8 @@ public class UsbDetailsTranscodeMtpController extends UsbDetailsController
mFragment.getPreferenceScreen().removePreference(mPreferenceCategory); 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( mPreferenceCategory.setEnabled(
connected && isDeviceInFileTransferMode(functions, dataRole)); connected && isDeviceInFileTransferMode(functions, dataRole));
} }

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

@@ -123,7 +123,7 @@ public class UsbDetailsTranscodeMtpControllerTest {
mUnderTest.refresh(true /* connected */, UsbManager.FUNCTION_MTP, POWER_ROLE_NONE, mUnderTest.refresh(true /* connected */, UsbManager.FUNCTION_MTP, POWER_ROLE_NONE,
DATA_ROLE_NONE); DATA_ROLE_NONE);
assertThat(getSwitchPreference().isChecked()).isTrue(); assertThat(getSwitchPreference().isChecked()).isFalse();
} }
@Test @Test
@@ -162,7 +162,7 @@ public class UsbDetailsTranscodeMtpControllerTest {
mUnderTest.displayPreference(mScreen); mUnderTest.displayPreference(mScreen);
getSwitchPreference().performClick(); getSwitchPreference().performClick();
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 @Test