summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kazutaka Murai <kazutaka.a.murai@sony.com> 2022-04-08 15:58:58 +0900
committer Snild Dolkow <snild@sony.com> 2022-08-30 11:21:59 +0200
commitfa8c01786a8542506908b2dba3b8e110e965d0e5 (patch)
tree8cc28cfda7dee34453336d8134729fb53543a9ae
parenta4d60be743ed8dee7f296ce0facc4a1ecc4d6998 (diff)
Hide contaminant dialog "Enable USB" button if not supported
The actual hardware functionality of "Enable USB" depends on USB HAL capability when Contaminant Detection UI is activated. When the port does not support enabling/disabling contaminant detection, the button has no effect other than showing a toast falsely claiming that USB was enabled. "Enable USB" should be disabled when USB HAL doesn't support it. Test: manual; button gone on device lacking disable-detect support Change-Id: Ib45eef13129f31d5a9d254278ad3c5c3f01db933
-rw-r--r--packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java
index d10e890f3c02..534049b65cb4 100644
--- a/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java
@@ -75,7 +75,12 @@ public class UsbContaminantActivity extends Activity implements View.OnClickList
mLearnMore.setVisibility(View.VISIBLE);
}
- mEnableUsb.setOnClickListener(this);
+ if (!mUsbPort.supportsEnableContaminantPresenceDetection()) {
+ mEnableUsb.setVisibility(View.GONE);
+ } else {
+ mEnableUsb.setOnClickListener(this);
+ }
+
mGotIt.setOnClickListener(this);
mLearnMore.setOnClickListener(this);
}