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

2021-05-17 02:54:58 +00:00
parent 63a1453832 804cb8801d
commit 53deb833da
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -11470,7 +11470,9 @@ public class Intent implements Parcelable, Cloneable {
        if (mAction != null && mAction.startsWith("android.bluetooth.")
                && hasExtra(BluetoothDevice.EXTRA_DEVICE)) {
            final BluetoothDevice device = getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            device.prepareToEnterProcess(source);
+            if (device != null) {
+                device.prepareToEnterProcess(source);
+            }
        }
    }