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

Merge "[Audiosharing] Remove audio streams from settings." into main

Browse Source
This commit is contained in:
Chelsea Hao
2024-03-04 02:33:18 +00:00
committed by Android (Google) Code Review
parent bec4c9573e e44cf95424
commit 7eb6df8ee7
8 changed files with 5 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/Settings.java
View File

@@ -403,7 +403,6 @@ public class Settings extends SettingsActivity {
public static class StylusUsiDetailsActivity extends SettingsActivity { /* empty */ }
public static class BluetoothBroadcastActivity extends SettingsActivity { /* empty */ }
public static class BluetoothFindBroadcastsActivity extends SettingsActivity { /* empty */ }
public static class AudioStreamConfirmDialogActivity extends SettingsActivity { /* empty */ }
public static class WifiCallingDisclaimerActivity extends SettingsActivity { /* empty */ }
public static class MobileNetworkListActivity extends SettingsActivity {}
public static class PowerMenuSettingsActivity extends SettingsActivity {}

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

@@ -18,6 +18,7 @@ package com.android.settings.bluetooth;
import static com.android.settingslib.bluetooth.BluetoothBroadcastUtils.EXTRA_BLUETOOTH_DEVICE_SINK;
import static com.android.settingslib.bluetooth.BluetoothBroadcastUtils.EXTRA_BLUETOOTH_SINK_IS_GROUP;
import static com.android.settingslib.flags.Flags.legacyLeAudioSharing;
import android.bluetooth.BluetoothDevice;
import android.content.Intent;
@@ -53,6 +54,10 @@ public class QrCodeScanModeActivity extends QrCodeScanModeBaseActivity {
@Override
protected void handleIntent(Intent intent) {
if (!legacyLeAudioSharing()) {
finish();
}
String action = intent != null ? intent.getAction() : null;
if (DEBUG) {
Log.d(TAG, "handleIntent(), action = " + action);