Merge "Handle the uncommon case that a name is null" into nyc-dev

am: 80354c4dfe

* commit '80354c4dfeae62fc120977d4fbdb8818f505b253':
  Handle the uncommon case that a name is null

Change-Id: Ia3ace5db78f7400998f51875a48c33f5208c324d

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

@@ -139,7 +139,7 @@ class MtpNotificationManager {
             if (usbInterface.getInterfaceClass() == UsbConstants.USB_SUBCLASS_VENDOR_SPEC &&
                     usbInterface.getInterfaceSubclass() == SUBCLASS_MTP &&
                     usbInterface.getInterfaceProtocol() == PROTOCOL_MTP &&
-                    usbInterface.getName().equals("MTP")) {
+                    "MTP".equals(usbInterface.getName())) {
                 return true;
             }
         }