Merge "Handle the uncommon case that a name is null" into nyc-dev am: 80354c4dfe

am: f6070c15f3

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

Change-Id: Ib518d8bb0314d54924eeda9c0c353be14f8ba1ea

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;
             }
         }