commit a8ae2ee371decb9504c8b449de45a253eae7d5c4
author Matthew Xie <mattx@google.com> Mon Jul 16 21:12:48 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 16 21:12:48 2012 -0700
tree 51d02e73cf0d590abc4251f54d8d60519df96bc2
parent d4d4e715c5f4423b9fadce77b120b8488e011337
parent 9773ebb7783ecd29957b43acbe5b26ba459a7458

Merge "Dock: Temporary removal of function to get BT address"

services/java/com/android/server/DockObserver.java

diff --git a/services/java/com/android/server/DockObserver.java b/services/java/com/android/server/DockObserver.java
index 72c0767..e7dac72 100644
--- a/services/java/com/android/server/DockObserver.java
+++ b/services/java/com/android/server/DockObserver.java
@@ -32,7 +32,6 @@
 import android.os.SystemClock;
 import android.os.UEventObserver;
 import android.provider.Settings;
-import android.server.BluetoothService;
 import android.util.Log;
 import android.util.Slog;
 
@@ -150,7 +149,8 @@
                         intent.putExtra(Intent.EXTRA_DOCK_STATE, mDockState);
 
                         // Check if this is Bluetooth Dock
-                        String address = BluetoothService.readDockBluetoothAddress();
+                        // TODO(BT): Get Dock address.
+                        String address = null;
                         if (address != null)
                             intent.putExtra(BluetoothDevice.EXTRA_DEVICE,
                                     BluetoothAdapter.getDefaultAdapter().getRemoteDevice(address));