commit 0102d98dc94c35ff0513c086942ad0e6d77b72fc
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 25 08:27:51 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 25 08:27:51 2019 +0000
tree 1bb0f00112cca673afb5b29b09be052705c5f116
parent b18061c3050e4ee85a14b866957b027fe9cea708
parent 283ae5d1bbf57facc21f2f63b6aab064500105ff

Merge "Error handler for start dialog from adb command"

src/com/android/settings/bluetooth/BluetoothPairingDialog.java

diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 060c174..927b1b6 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -65,6 +65,11 @@
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Intent intent = getIntent();
+        if (intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE) == null) {
+            // Error handler for the case that dialog is started from adb command.
+            finish();
+            return;
+        }
         mBluetoothPairingController = new BluetoothPairingController(intent, this);
         // build the dialog fragment
         boolean fragmentFound = true;