Merge "Handle null accessory strings safely" into main (6f89b52b) · Commits · e / os / android_frameworks_base

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

+31 −22

Original line number	Original line	Diff line number	Diff line
	@@ -874,10 +874,16 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
	// successfully entered accessory mode		// successfully entered accessory mode
	String[] accessoryStrings = mUsbDeviceManager.getAccessoryStrings();		String[] accessoryStrings = mUsbDeviceManager.getAccessoryStrings();
	if (accessoryStrings != null) {		if (accessoryStrings != null) {
	UsbSerialReader serialReader = new UsbSerialReader(mContext, mPermissionManager,		if (accessoryStrings[UsbAccessory.MANUFACTURER_STRING] != null
			&& accessoryStrings[UsbAccessory.MODEL_STRING] != null) {
			UsbSerialReader serialReader =
			new UsbSerialReader(
			mContext,
			mPermissionManager,
	accessoryStrings[UsbAccessory.SERIAL_STRING]);		accessoryStrings[UsbAccessory.SERIAL_STRING]);

	mCurrentAccessory = new UsbAccessory(		mCurrentAccessory =
			new UsbAccessory(
	accessoryStrings[UsbAccessory.MANUFACTURER_STRING],		accessoryStrings[UsbAccessory.MANUFACTURER_STRING],
	accessoryStrings[UsbAccessory.MODEL_STRING],		accessoryStrings[UsbAccessory.MODEL_STRING],
	accessoryStrings[UsbAccessory.DESCRIPTION_STRING],		accessoryStrings[UsbAccessory.DESCRIPTION_STRING],
	@@ -897,6 +903,9 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
	if (Flags.checkUserActionUnlocked() && mUserUnlockedAfterBoot) {		if (Flags.checkUserActionUnlocked() && mUserUnlockedAfterBoot) {
	attachAccessory();		attachAccessory();
	} // else handle in boot completed		} // else handle in boot completed
			} else {
			Slog.e(TAG, "expected non-null accessory strings are null");
			}
	} else {		} else {
	Slog.e(TAG, "nativeGetAccessoryStrings failed");		Slog.e(TAG, "nativeGetAccessoryStrings failed");
	}		}