Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11c45862 authored by Srinivas Patibandla's avatar Srinivas Patibandla Committed by Android (Google) Code Review
Browse files

Merge "[Hide DCK Device] Move the aconfig flag for hide DCK device feature to... 

Merge "[Hide DCK Device] Move the aconfig flag for hide DCK device feature to settingslib" into main
parents 8dbdb4ec 85f941f9

aconfig/settings_connecteddevice_flag_declarations.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -21,10 +21,3 @@ flag { 
  description: "Order the saved bluetooth devices by most recently connected."

  bug: "306160434"

}
 


flag {

  name: "enable_hide_exclusively_managed_bluetooth_device"

  namespace: "dck_framework"

  description: "Hide exclusively managed Bluetooth devices in BT settings menu."

  bug: "322285078"

}

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

+1 −1
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import android.util.Log; 
import androidx.preference.Preference;



import com.android.settings.connecteddevice.DevicePreferenceCallback;

import com.android.settings.flags.Flags;

import com.android.settingslib.bluetooth.BluetoothUtils;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.flags.Flags;



/**

 * Controller to maintain connected bluetooth devices

src/com/android/settings/bluetooth/DeviceListPreferenceFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ import androidx.preference.PreferenceCategory 
import androidx.preference.PreferenceGroup

import com.android.settings.R

import com.android.settings.dashboard.RestrictedDashboardFragment

import com.android.settings.flags.Flags

import com.android.settingslib.bluetooth.BluetoothCallback

import com.android.settingslib.bluetooth.BluetoothDeviceFilter

import com.android.settingslib.bluetooth.BluetoothUtils

import com.android.settingslib.bluetooth.CachedBluetoothDevice

import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager

import com.android.settingslib.bluetooth.LocalBluetoothManager

import com.android.settingslib.flags.Flags

import java.util.concurrent.ConcurrentHashMap

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

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

+1 −1
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ import androidx.annotation.VisibleForTesting; 
import androidx.preference.Preference;



import com.android.settings.connecteddevice.DevicePreferenceCallback;

import com.android.settings.flags.Flags;

import com.android.settingslib.bluetooth.BluetoothUtils;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;

import com.android.settingslib.flags.Flags;



import java.util.ArrayList;

import java.util.List;

tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java

+1 −1
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ import android.util.Pair; 


import com.android.settings.connecteddevice.DevicePreferenceCallback;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.flags.Flags;

import com.android.settings.testutils.shadow.ShadowAudioManager;

import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;

import com.android.settings.testutils.shadow.ShadowCachedBluetoothDeviceManager;

import com.android.settingslib.bluetooth.BluetoothUtils;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.flags.Flags;



import org.junit.Before;

import org.junit.Rule;