PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Error handler for start dialog from adb command"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-25 08:27:51 +00:00
committed by Android (Google) Code Review
parent b18061c305 283ae5d1bb
commit 0102d98dc9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -65,6 +65,11 @@ public class BluetoothPairingDialog extends FragmentActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Intent intent = getIntent(); 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); mBluetoothPairingController = new BluetoothPairingController(intent, this);
// build the dialog fragment // build the dialog fragment
boolean fragmentFound = true; boolean fragmentFound = true;