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

        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();