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

Commit e9c5eb24 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Fix ADB notification." into gingerbread

parents 248de37e 83adad9e

services/java/com/android/server/NotificationManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -425,10 +425,10 @@ public class NotificationManagerService extends INotificationManager.Stub 
                }

            } else if (action.equals(UsbManager.ACTION_USB_STATE)) {

                Bundle extras = intent.getExtras();

                boolean usbConnected = extras.getBoolean(UsbManager.USB_CONNECTED);

                mUsbConnected = extras.getBoolean(UsbManager.USB_CONNECTED);

                boolean adbEnabled = (UsbManager.USB_FUNCTION_ENABLED.equals(

                                    extras.getString(UsbManager.USB_FUNCTION_ADB)));

                updateAdbNotification(usbConnected && adbEnabled);

                updateAdbNotification(mUsbConnected && adbEnabled);

            } else if (action.equals(Intent.ACTION_PACKAGE_REMOVED)

                    || action.equals(Intent.ACTION_PACKAGE_RESTARTED)

                    || (queryRestart=action.equals(Intent.ACTION_QUERY_PACKAGE_RESTART))