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

Merge "Remove Bluetooth autoconnect on dock" am: b65c7fc810 am: e7d5b13f53 am: deb32c220b

Browse Source 
am: 76405153d1

Change-Id: I5d4283ec0aa65b8faf6a97693dcdb40df353c48a
This commit is contained in:
Marie Janssen
2017-02-10 18:23:00 +00:00
committed by android-build-merger
parent 765062ac3d 76405153d1
commit 9241c3ec3c
5 changed files with 0 additions and 1174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/bluetooth/Utils.java
View File

@@ -24,7 +24,6 @@ import android.content.DialogInterface;
import android.widget.Toast;
import com.android.settings.R;
import com.android.settings.bluetooth.DockService.DockBluetoothCallback;
import com.android.settings.search.Index;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -85,11 +84,6 @@ public final class Utils {
// TODO: wire this up to show connection errors...
static void showConnectingError(Context context, String name) {
// if (!mIsConnectingErrorPossible) {
// return;
// }
// mIsConnectingErrorPossible = false;
showError(context, name, R.string.bluetooth_connecting_error_message);
}
@@ -147,8 +141,6 @@ public final class Utils {
@Override
public void onBluetoothManagerInitialized(Context appContext,
LocalBluetoothManager bluetoothManager) {
bluetoothManager.getEventManager().registerCallback(
new DockBluetoothCallback(appContext));
com.android.settingslib.bluetooth.Utils.setErrorListener(mErrorListener);
}
};