From 804cb8801d61c4c2a37802b192c1bd1b3542364d Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Sun, 16 May 2021 20:45:07 -0600
Subject: [PATCH] Guard against null BluetoothDevice extras.

Bug: 188364781
Change-Id: If976318763fac7e5cb4b59300f104c9cd9392eaf
---
 core/java/android/content/Intent.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index bacb773a4746e..a436fa48a5f26 100644
--- 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);
+            }
         }
     }