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

Merge "[Audiosharing] When bt is off or unsupported, we show "Please connect a device" dialog after camera scans a QR code" into main

Browse Source
This commit is contained in:
Chelsea Hao
2025-01-05 19:07:56 -08:00
committed by Android (Google) Code Review
parent a98694a34c d187437c57
commit 1d10e6bba2
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivity.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams; package com.android.settings.connecteddevice.audiosharing.audiostreams;
import android.bluetooth.BluetoothAdapter;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
@@ -51,6 +52,7 @@ public class AudioStreamConfirmDialogActivity extends SettingsActivity
@Override @Override
protected void createUiFromIntent(@Nullable Bundle savedState, Intent intent) { protected void createUiFromIntent(@Nullable Bundle savedState, Intent intent) {
if (BluetoothUtils.isAudioSharingUIAvailable(this) if (BluetoothUtils.isAudioSharingUIAvailable(this)
&& !isBluetoothUnsupportedOrOff()
&& !AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) { && !AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) {
Log.d(TAG, "createUiFromIntent() : supported but not ready, skip createUiFromIntent"); Log.d(TAG, "createUiFromIntent() : supported but not ready, skip createUiFromIntent");
mSavedState = savedState; mSavedState = savedState;
@@ -68,6 +70,7 @@ public class AudioStreamConfirmDialogActivity extends SettingsActivity
@Override @Override
public void onStart() { public void onStart() {
if (BluetoothUtils.isAudioSharingUIAvailable(this) if (BluetoothUtils.isAudioSharingUIAvailable(this)
&& !isBluetoothUnsupportedOrOff()
&& !AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) { && !AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) {
Log.d(TAG, "onStart() : supported but not ready, listen to service ready"); Log.d(TAG, "onStart() : supported but not ready, listen to service ready");
if (mProfileManager != null) { if (mProfileManager != null) {
@@ -88,6 +91,7 @@ public class AudioStreamConfirmDialogActivity extends SettingsActivity
@Override @Override
public void onServiceConnected() { public void onServiceConnected() {
if (BluetoothUtils.isAudioSharingUIAvailable(this) if (BluetoothUtils.isAudioSharingUIAvailable(this)
&& !isBluetoothUnsupportedOrOff()
&& AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) { && AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) {
if (mProfileManager != null) { if (mProfileManager != null) {
mProfileManager.removeServiceListener(this); mProfileManager.removeServiceListener(this);
@@ -106,4 +110,9 @@ public class AudioStreamConfirmDialogActivity extends SettingsActivity
protected boolean isValidFragment(String fragmentName) { protected boolean isValidFragment(String fragmentName) {
return AudioStreamConfirmDialog.class.getName().equals(fragmentName); return AudioStreamConfirmDialog.class.getName().equals(fragmentName);
} }
private static boolean isBluetoothUnsupportedOrOff() {
var adapter = BluetoothAdapter.getDefaultAdapter();
return adapter == null || !adapter.isEnabled();
}
} }

9
tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivityTest.java
View File

@@ -139,6 +139,15 @@ public class AudioStreamConfirmDialogActivityTest {
verify(mLocalBluetoothProfileManager, never()).addServiceListener(any()); verify(mLocalBluetoothProfileManager, never()).addServiceListener(any());
} }
@Test
public void setupActivity_serviceNotReady_bluetoothOff_doNothing() {
when(mAssistant.isProfileReady()).thenReturn(false);
mShadowBluetoothAdapter.setEnabled(false);
mActivity = Robolectric.setupActivity(AudioStreamConfirmDialogActivity.class);
verify(mLocalBluetoothProfileManager, never()).addServiceListener(any());
}
@Test @Test
public void onStop_unregisterCallback() { public void onStop_unregisterCallback() {
mActivity = Robolectric.setupActivity(AudioStreamConfirmDialogActivity.class); mActivity = Robolectric.setupActivity(AudioStreamConfirmDialogActivity.class);