summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Wei <jameswei@google.com>2021-08-16 17:13:47 +0800
committerJames Wei <jameswei@google.com>2021-08-16 17:13:47 +0800
commitc0162a74b905d93098830f32b5fec9a317e8af37 (patch)
treee3722c3f4c9d1592470c64b8def11d4471bdd270
parentc9ce62c06bd96f7b1ce915353ef03ec57fe411fb (diff)
downloadbase-c0162a74b905d93098830f32b5fec9a317e8af37.tar.gz
USB: Correct title bar notification
Change notification in accordance with additional tethering support on NCM Bug: 196240561 Test: Manual test: Switch USB tethering to and from MTP / Charge Only Change-Id: I7a5e1d7066774d60c3ba7f453554dc3a25b0af69
-rw-r--r--services/usb/java/com/android/server/usb/UsbDeviceManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 7f24c365237d..85f16eb00987 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -1193,7 +1193,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
} else if (mCurrentFunctions == UsbManager.FUNCTION_MIDI) {
titleRes = com.android.internal.R.string.usb_midi_notification_title;
id = SystemMessage.NOTE_USB_MIDI;
- } else if (mCurrentFunctions == UsbManager.FUNCTION_RNDIS) {
+ } else if ((mCurrentFunctions == UsbManager.FUNCTION_RNDIS)
+ || (mCurrentFunctions == UsbManager.FUNCTION_NCM)) {
titleRes = com.android.internal.R.string.usb_tether_notification_title;
id = SystemMessage.NOTE_USB_TETHER;
} else if (mCurrentFunctions == UsbManager.FUNCTION_ACCESSORY) {