Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 80354c4dfe

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

Change-Id: Ia3ace5db78f7400998f51875a48c33f5208c324d
This commit is contained in:
Philip P. Moltmann
2016-06-02 00:35:22 +00:00
committed by android-build-merger
parent 08e5d0596e 80354c4dfe
commit f6070c15f3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/usb/java/com/android/server/usb/MtpNotificationManager.java
View File

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