diff options
| author | Lei Yu <jackqdyulei@google.com> | 2019-04-10 16:05:27 -0700 |
|---|---|---|
| committer | Lei Yu <jackqdyulei@google.com> | 2019-04-18 11:31:05 -0700 |
| commit | 15899e8b0efe6549cb2cb59fbce06d9e27a87c49 (patch) | |
| tree | df92cfc918a4d614a9d0e0d953a940609bbb2c59 /src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java | |
| parent | 7f9a86d869cb1d54b46cad9d785500f5230a4f8c (diff) | |
| download | packages_apps_Settings-15899e8b0efe6549cb2cb59fbce06d9e27a87c49.tar.gz packages_apps_Settings-15899e8b0efe6549cb2cb59fbce06d9e27a87c49.tar.bz2 packages_apps_Settings-15899e8b0efe6549cb2cb59fbce06d9e27a87c49.zip | |
Add SettingsPolicy to control BT feature
Fixes: 130302238
Test: RunSettingsRoboTests
Change-Id: I7e1bf55c476f8e4d3dec7a7dfc0e8d44e5bd53ae
Diffstat (limited to 'src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java')
| -rw-r--r-- | src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java index d6a668e61f..112d7b81ee 100644 --- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java @@ -26,6 +26,7 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Handler; import android.os.Looper; +import android.provider.DeviceConfig; import android.provider.MediaStore; import android.util.Log; import android.view.View; @@ -38,6 +39,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settings.core.SettingsUIDeviceConfig; import com.android.settings.fuelgauge.BatteryMeterView; import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -64,7 +66,6 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont @VisibleForTesting final Map<String, Bitmap> mIconCache; private CachedBluetoothDevice mCachedDevice; - private BluetoothDevice mBluetoothDevice; @VisibleForTesting BluetoothAdapter mBluetoothAdapter; @VisibleForTesting @@ -88,9 +89,11 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont @Override public int getAvailabilityStatus() { + final boolean advancedEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI, + SettingsUIDeviceConfig.BT_ADVANCED_HEADER_ENABLED, true); final boolean untetheredHeadset = BluetoothUtils.getBooleanMetaData( mCachedDevice.getDevice(), BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET); - return untetheredHeadset ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; + return advancedEnabled && untetheredHeadset ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } @Override @@ -138,7 +141,6 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont public void init(CachedBluetoothDevice cachedBluetoothDevice) { mCachedDevice = cachedBluetoothDevice; - mBluetoothDevice = mCachedDevice.getDevice(); } @VisibleForTesting |