Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5010431 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

UsbDeviceManager: Don't show USB notification for RNDIS 



since USB tethering already has a notification.

Bug: 4988511

Change-Id: I928cb1e1d191c77340f7f05edfa80a74cdabe6ed
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 83e32904

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

+14 −15
Original line number Diff line number Diff line
@@ -528,10 +528,10 @@ public class UsbDeviceManager { 


        private void updateUsbNotification() {

            if (mNotificationManager == null || !mUseUsbNotification) return;

            if (mConnected) {

            int id = NOTIFICATION_NONE;

            Resources r = mContext.getResources();

            CharSequence title = null;

                int id = NOTIFICATION_NONE;

            if (mConnected) {

                if (containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_MTP)) {

                    title = r.getText(

                        com.android.internal.R.string.usb_mtp_notification_title);
@@ -550,16 +550,19 @@ public class UsbDeviceManager { 
                        com.android.internal.R.string.usb_accessory_notification_title);

                    id = NOTIFICATION_ACCESSORY;

                } else {

                    // There is a different notification for USB tethering so we don't need one here

                    if (!containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_RNDIS)) {

                        Slog.e(TAG, "No known USB function in updateUsbNotification");

                    }

                }

            }

            if (id != mUsbNotificationId) {

                // clear notification if title needs changing

                if (mUsbNotificationId != NOTIFICATION_NONE) {

                    mNotificationManager.cancel(mUsbNotificationId);

                    mUsbNotificationId = NOTIFICATION_NONE;

                }

                }

                if (mUsbNotificationId == NOTIFICATION_NONE) {

                if (id != NOTIFICATION_NONE) {

                    CharSequence message = r.getText(

                            com.android.internal.R.string.usb_notification_message);
@@ -584,10 +587,6 @@ public class UsbDeviceManager { 
                    mNotificationManager.notify(id, notification);

                    mUsbNotificationId = id;

                }



            } else if (mUsbNotificationId != NOTIFICATION_NONE) {

                mNotificationManager.cancel(mUsbNotificationId);

                mUsbNotificationId = NOTIFICATION_NONE;

            }

        }