Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Guard against null BluetoothDevice extras." into sc-dev am: 53deb833da am: a19c83bd2c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14556719

Change-Id: I8776d128f2417a62e1221726a3924ceae4cec233
This commit is contained in:
Jeff Sharkey
2021-05-19 22:47:55 +00:00
committed by Automerger Merge Worker
parent 124b6d071d a19c83bd2c
commit 40a2050e5c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/Intent.java
View File

@@ -11494,7 +11494,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);
}
}
}