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

Commit 5c611d54 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14597813] into sc-release 

Change-Id: I2b1f43a772f476760114973e1e996dd44342357e
parents 0e53b2fe 8b7cc810

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