Update the list of Take call on

To make sure that all connected devices can be shown in the list of Take
call on setting, we add a listener for local bluetooth profile change
and update the list when the profile is connected.

Fixes: 352236362
Test: manual test
Flag: EXEMPT bugfix
Change-Id: I76476d4e6201b6c5c2726747410d225ff1ade9da
This commit is contained in:
Mill Chen
2024-08-30 17:42:24 +00:00
parent 04ef86d174
commit b1f70dc330
2 changed files with 57 additions and 1 deletions

View File

@@ -45,6 +45,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.bluetooth.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.FeatureFlags;
import com.android.settings.sounde.AudioSwitchUtils;
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.BluetoothCallback;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -68,7 +69,8 @@ import java.util.concurrent.FutureTask;
* updating the current status of switcher entry. Subclasses must overwrite
*/
public abstract class AudioSwitchPreferenceController extends BasePreferenceController
implements BluetoothCallback, LifecycleObserver, OnStart, OnStop {
implements BluetoothCallback, LifecycleObserver, OnStart, OnStop,
LocalBluetoothProfileManager.ServiceListener {
private static final String TAG = "AudioSwitchPrefCtrl";
@@ -149,6 +151,11 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
return;
}
mLocalBluetoothManager.setForegroundActivity(mContext);
if (!AudioSwitchUtils.isLeAudioProfileReady(mProfileManager)) {
if (mProfileManager != null) {
mProfileManager.addServiceListener(this);
}
}
register();
}
@@ -159,6 +166,9 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
return;
}
mLocalBluetoothManager.setForegroundActivity(null);
if (mProfileManager != null) {
mProfileManager.removeServiceListener(this);
}
unregister();
}
@@ -193,6 +203,20 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
updateState(mPreference);
}
@Override
public void onServiceConnected() {
Log.d(TAG, "onServiceConnected");
if (AudioSwitchUtils.isLeAudioProfileReady(mProfileManager)) {
updateState(mPreference);
}
}
@Override
public void onServiceDisconnected() {
Log.d(TAG, "onServiceDisconnected()");
// Do nothing.
}
public void setCallback(AudioSwitchCallback callback) {
mAudioSwitchPreferenceCallback = callback;
}