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

Commit 53deb833 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Guard against null BluetoothDevice extras." into sc-dev

parents 63a14538 804cb880

core/java/android/content/Intent.java

+3 −1
Original line number Diff line number Diff line
@@ -11470,9 +11470,11 @@ public class Intent implements Parcelable, Cloneable { 
        if (mAction != null && mAction.startsWith("android.bluetooth.")

                && hasExtra(BluetoothDevice.EXTRA_DEVICE)) {

            final BluetoothDevice device = getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);

            if (device != null) {

                device.prepareToEnterProcess(source);

            }

        }

    }



    /** @hide */

    public boolean hasWebURI() {