From c0162a74b905d93098830f32b5fec9a317e8af37 Mon Sep 17 00:00:00 2001
From: James Wei <jameswei@google.com>
Date: Mon, 16 Aug 2021 17:13:47 +0800
Subject: [PATCH] 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
---
 services/usb/java/com/android/server/usb/UsbDeviceManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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