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

Merge "Do nothing when choosing file transfer when in accessory mode"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-30 06:54:29 +00:00
committed by Android (Google) Code Review
parent e8fa746299 3251a04ba3
commit 5709f7a083
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
View File

@@ -115,7 +115,8 @@ public class UsbDetailsFunctionsController extends UsbDetailsController
public void onRadioButtonClicked(RadioButtonPreference preference) {
final long function = UsbBackend.usbFunctionsFromString(preference.getKey());
final long previousFunction = mUsbBackend.getCurrentFunctions();
if (function != previousFunction && !Utils.isMonkeyRunning()) {
if (function != previousFunction && !Utils.isMonkeyRunning()
&& !shouldIgnoreClickEvent(function, previousFunction)) {
mPreviousFunction = previousFunction;
//Update the UI in advance to make it looks smooth
@@ -138,6 +139,11 @@ public class UsbDetailsFunctionsController extends UsbDetailsController
}
}
private boolean shouldIgnoreClickEvent(long function, long previousFunction) {
return previousFunction == UsbManager.FUNCTION_ACCESSORY
&& function == UsbManager.FUNCTION_MTP;
}
@Override
public boolean isAvailable() {
return !Utils.isMonkeyRunning();