Revert "BLE peripheral mode (4/4): Settings change for advertising preference."

This reverts commit eb56b9ccb8.

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
This commit is contained in:
Wei Wang
2014-02-27 16:28:34 -08:00
parent ee4f84b0fb
commit 17d2124c1c
16 changed files with 52 additions and 579 deletions

View File

@@ -118,9 +118,6 @@ public final class LocalBluetoothAdapter {
return mAdapter.isDiscovering();
}
boolean isAdvertising() {
return mAdapter.isAdvertising();
}
boolean isEnabled() {
return mAdapter.isEnabled();
}
@@ -129,14 +126,6 @@ public final class LocalBluetoothAdapter {
mAdapter.setDiscoverableTimeout(timeout);
}
boolean startAdvertising() {
return mAdapter.startAdvertising();
}
boolean stopAdvertising() {
return mAdapter.stopAdvertisting();
}
void setName(String name) {
mAdapter.setName(name);
}