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

Commit 8b7cc810 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-team Robot
Browse files

Guard against null BluetoothDevice extras. 

Bug: 188364781
Change-Id: If976318763fac7e5cb4b59300f104c9cd9392eaf
(cherry picked from commit 804cb880)
parent 0e53b2fe

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