summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
diff options
context:
space:
mode:
authorWei Wang <weiwa@google.com>2014-02-27 16:28:34 -0800
committerWei Wang <weiwa@google.com>2014-03-19 22:37:27 -0700
commit41f5437def4b97581d67b5636ca2dba10f8eb385 (patch)
tree761557756aeea4a8e16b98df45efa475fd7161c1 /src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
parent27259b53e6db8781ef7aea614298d50bf26d30e4 (diff)
downloadpackages_apps_Settings-41f5437def4b97581d67b5636ca2dba10f8eb385.zip
packages_apps_Settings-41f5437def4b97581d67b5636ca2dba10f8eb385.tar.gz
packages_apps_Settings-41f5437def4b97581d67b5636ca2dba10f8eb385.tar.bz2
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
This is cherry pick from master/klp-dev changes. This reverts commit eb56b9ccb8fa70a6c567d0bcd02f821e4de4bf7b. Conflicts: src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java src/com/android/settings/bluetooth/BluetoothSettings.java src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87 Conflicts: src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java src/com/android/settings/bluetooth/BluetoothSettings.java src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
Diffstat (limited to 'src/com/android/settings/bluetooth/LocalBluetoothPreferences.java')
-rw-r--r--src/com/android/settings/bluetooth/LocalBluetoothPreferences.java17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index f862f72..f00b801 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -17,10 +17,8 @@
package com.android.settings.bluetooth;
import android.app.QueuedWork;
-import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
import android.content.res.Configuration;
import android.util.Log;
@@ -48,10 +46,6 @@ final class LocalBluetoothPreferences {
private static final String KEY_DISCOVERABLE_END_TIMESTAMP = "discoverable_end_timestamp";
- private static final String KEY_ADVERTISEMENT_PREFERENCE = "bt_advertisement_perference";
-
- private static final boolean DEFAULT_ADVERTISING_ENABLED = false;
-
private LocalBluetoothPreferences() {
}
@@ -64,17 +58,6 @@ final class LocalBluetoothPreferences {
KEY_DISCOVERABLE_END_TIMESTAMP, 0);
}
- static boolean isAdvertisingEnabled(Context context) {
- return getSharedPreferences(context).getBoolean(
- KEY_ADVERTISEMENT_PREFERENCE, DEFAULT_ADVERTISING_ENABLED);
- }
-
- static void setAdvertisingEnabled(Context context, boolean advertisingEnabled) {
- Editor preferenceEditor = getSharedPreferences(context).edit();
- preferenceEditor.putBoolean(KEY_ADVERTISEMENT_PREFERENCE, advertisingEnabled);
- preferenceEditor.apply();
- }
-
static boolean shouldShowDialogInForeground(Context context,
String deviceAddress) {
LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);