diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2021-05-16 20:45:07 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2021-05-16 20:45:20 -0600 |
| commit | 804cb8801d61c4c2a37802b192c1bd1b3542364d (patch) | |
| tree | dd92f5025aa394ef9599a9676699e173e9f1048f /core/java/android/content/Intent.java | |
| parent | 5014fbd6443637f4d7cd52860102cc03161172f8 (diff) | |
Guard against null BluetoothDevice extras.
Bug: 188364781
Change-Id: If976318763fac7e5cb4b59300f104c9cd9392eaf
Diffstat (limited to 'core/java/android/content/Intent.java')
| -rw-r--r-- | core/java/android/content/Intent.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index bacb773a4746..a436fa48a5f2 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); + } } } |