commit e75f77d7536c7a3da2d9798631ef422c3833cd49
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 13 05:08:01 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 13 05:08:01 2019 +0000
tree e6b58c040072067194abb2543c068fd1b862c3f2
parent 673b5393a73a1065c054d5a213013dc577eabde9
parent e487b00157c77cb665ae3a44f006d660f7417f50

Merge "Don't use Lambda when register callback"

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

diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index e245c22..2bc5592 100644
--- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -112,7 +112,7 @@
         if (!isAvailable()) {
             return;
         }
-        mCachedDevice.registerCallback(this::onDeviceAttributesChanged);
+        mCachedDevice.registerCallback(this);
         mBluetoothAdapter.addOnMetadataChangedListener(mCachedDevice.getDevice(),
                 mContext.getMainExecutor(), mMetadataListener);
     }
@@ -122,7 +122,7 @@
         if (!isAvailable()) {
             return;
         }
-        mCachedDevice.unregisterCallback(this::onDeviceAttributesChanged);
+        mCachedDevice.unregisterCallback(this);
         mBluetoothAdapter.removeOnMetadataChangedListener(mCachedDevice.getDevice(),
                 mMetadataListener);
     }
@@ -153,7 +153,7 @@
             final TextView summary = mLayoutPreference.findViewById(R.id.entity_header_summary);
             summary.setText(mCachedDevice.getConnectionSummary(true /* shortSummary */));
 
-            if (!mCachedDevice.isConnected()) {
+            if (!mCachedDevice.isConnected() || mCachedDevice.isBusy()) {
                 updateDisconnectLayout();
                 return;
             }