Commit 70c8e5b4 authored Aug 06, 2020 by James Wei Committed by Automerger Merge Worker Aug 06, 2020

Merge "UsbAccessory: Update language to comply with Android's inclusive...

Merge "UsbAccessory: Update language to comply with Android's inclusive language guidance" am: 3c127a54 am: 6549bf6d am: 51929ba1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382397

Change-Id: I5241b4b9dc639ceeb59cbe8c76fdf712c7281a10

packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ public class UsbAccessoryUriActivity extends AlertActivity
		String uriString = intent.getStringExtra("uri");
		mUri = (uriString == null ? null : Uri.parse(uriString));

		// sanity check before displaying dialog
		// Exception check before displaying dialog
		if (mUri == null) {
		Log.e(TAG, "could not parse Uri " + uriString);
		finish();