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

Commit 097ab944 authored Sep 08, 2021 by TreeHugger Robot Committed by Automerger Merge Worker Sep 08, 2021

Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe7

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

Change-Id: Ib14609c4e8f875d1921638194461102dcdc6ede8

parents 2405b243 b370bfe7

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -198,8 +198,9 @@ public class UsbDefaultFragment extends RadioButtonPickerFragment {

		@Override
		public void onTetheringStarted() {
		Log.d(TAG, "onTetheringStarted()");
		// Set default usb functions again to make internal data persistent
		mCurrentFunctions = mUsbBackend.getCurrentFunctions();
		Log.d(TAG, "onTetheringStarted() : mCurrentFunctions " + mCurrentFunctions);
		mUsbBackend.setDefaultUsbFunctions(mCurrentFunctions);
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -183,7 +183,7 @@ public class UsbDefaultFragmentTest {

		@Test
		public void onTetheringStarted_currentFunctionsIsRndis_setsRndisAsDefaultUsbFunctions() {
		mFragment.mCurrentFunctions = UsbManager.FUNCTION_RNDIS;
		when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_RNDIS);

		mFragment.mOnStartTetheringCallback.onTetheringStarted();

		@@ -192,7 +192,7 @@ public class UsbDefaultFragmentTest {

		@Test
		public void onTetheringStarted_currentFunctionsIsNcm_setsNcmAsDefaultUsbFunctions() {
		mFragment.mCurrentFunctions = UsbManager.FUNCTION_NCM;
		when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_NCM);

		mFragment.mOnStartTetheringCallback.onTetheringStarted();