Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51929ba1 authored by James Wei's avatar James Wei Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ib01f4fc9c916d998641bd944fb8d416fb8a3ac2d
parents 955e04a8 6549bf6d

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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();