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

Merge "UsbAccessory: Update language to comply with Android's inclusive language guidance" am: 3c127a54bb am: 6549bf6d3d

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

Change-Id: Ib01f4fc9c916d998641bd944fb8d416fb8a3ac2d
This commit is contained in:
James Wei
2020-08-06 16:04:11 +00:00
committed by Automerger Merge Worker
parent 955e04a8ee 6549bf6d3d
commit 51929ba1f3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java
View File

@@ -54,7 +54,7 @@ public class UsbAccessoryUriActivity extends AlertActivity
String uriString = intent.getStringExtra("uri"); String uriString = intent.getStringExtra("uri");
mUri = (uriString == null ? null : Uri.parse(uriString)); mUri = (uriString == null ? null : Uri.parse(uriString));
// sanity check before displaying dialog // Exception check before displaying dialog
if (mUri == null) { if (mUri == null) {
Log.e(TAG, "could not parse Uri " + uriString); Log.e(TAG, "could not parse Uri " + uriString);
finish(); finish();