Merge "Don't use Lambda when register callback"

This commit is contained in:
TreeHugger Robot
2019-11-13 05:08:01 +00:00
committed by Android (Google) Code Review

View File

@@ -112,7 +112,7 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
if (!isAvailable()) { if (!isAvailable()) {
return; return;
} }
mCachedDevice.registerCallback(this::onDeviceAttributesChanged); mCachedDevice.registerCallback(this);
mBluetoothAdapter.addOnMetadataChangedListener(mCachedDevice.getDevice(), mBluetoothAdapter.addOnMetadataChangedListener(mCachedDevice.getDevice(),
mContext.getMainExecutor(), mMetadataListener); mContext.getMainExecutor(), mMetadataListener);
} }
@@ -122,7 +122,7 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
if (!isAvailable()) { if (!isAvailable()) {
return; return;
} }
mCachedDevice.unregisterCallback(this::onDeviceAttributesChanged); mCachedDevice.unregisterCallback(this);
mBluetoothAdapter.removeOnMetadataChangedListener(mCachedDevice.getDevice(), mBluetoothAdapter.removeOnMetadataChangedListener(mCachedDevice.getDevice(),
mMetadataListener); mMetadataListener);
} }
@@ -153,7 +153,7 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
final TextView summary = mLayoutPreference.findViewById(R.id.entity_header_summary); final TextView summary = mLayoutPreference.findViewById(R.id.entity_header_summary);
summary.setText(mCachedDevice.getConnectionSummary(true /* shortSummary */)); summary.setText(mCachedDevice.getConnectionSummary(true /* shortSummary */));
if (!mCachedDevice.isConnected()) { if (!mCachedDevice.isConnected() || mCachedDevice.isBusy()) {
updateDisconnectLayout(); updateDisconnectLayout();
return; return;
} }