commit 4f7f6fba23ab9a234516511bdb3257a5d4d15115
author James Wei <jameswei@google.com> Mon Aug 16 10:51:21 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 16 10:51:21 2021 +0000
tree 055c21ac71d33144a46f671c229d95b6ba02ebd3
parent 01c0e57647341b2efc239a19daaafb880352bd2e
parent c0162a74b905d93098830f32b5fec9a317e8af37

USB: Correct title bar notification am: c0162a74b9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580595

Change-Id: I5c1606698ca17794051bf9a52ea19ee608ece70e

services/usb/java/com/android/server/usb/UsbDeviceManager.java

diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 7f24c36..85f16eb 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 @@
                 } 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) {