diff options
Diffstat (limited to 'core/java/android/server')
| -rw-r--r-- | core/java/android/server/BluetoothEventLoop.java | 4 | ||||
| -rw-r--r-- | core/java/android/server/BluetoothService.java | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index d2620d7..4edc01f 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -39,7 +39,7 @@ import android.os.PowerManager; /** * TODO: Move this to * java/services/com/android/server/BluetoothEventLoop.java - * and make the contructor package private again. + * and make the constructor package private again. * * @hide */ @@ -754,7 +754,7 @@ class BluetoothEventLoop { private void onRestartRequired() { if (mBluetoothService.isEnabled()) { - Log.e(TAG, "*** A serious error occured (did bluetoothd crash?) - " + + Log.e(TAG, "*** A serious error occurred (did bluetoothd crash?) - " + "restarting Bluetooth ***"); mHandler.sendEmptyMessage(EVENT_RESTART_BLUETOOTH); } diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index bd105a7..f8caa2c 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -500,7 +500,7 @@ public class BluetoothService extends IBluetooth.Stub { // forked multiple times in a row, probably because there is // some race in sdptool or bluez when operated in parallel. // As a workaround, delay 500ms between each fork of sdptool. - // TODO: Don't fork sdptool in order to regsiter service + // TODO: Don't fork sdptool in order to register service // records, use a DBUS call instead. switch (msg.arg1) { case 1: @@ -713,7 +713,7 @@ public class BluetoothService extends IBluetooth.Stub { /** local cache of bonding state. /* we keep our own state to track the intermediate state BONDING, which /* bluez does not track. - * All addreses must be passed in upper case. + * All addresses must be passed in upper case. */ public class BondState { private final HashMap<String, Integer> mState = new HashMap<String, Integer>(); @@ -976,7 +976,7 @@ public class BluetoothService extends IBluetooth.Stub { } } - // This function adds a bluetooth address to the auto pairing blacklis + // This function adds a bluetooth address to the auto pairing blacklist // file. These addresses are added to DynamicAddressBlacklistSection private void updateAutoPairingData(String address) { BufferedWriter out = null; @@ -1106,7 +1106,7 @@ public class BluetoothService extends IBluetooth.Stub { * a device discoverable; you need to call setMode() to make the device * explicitly discoverable. * - * @param timeout_s The discoverable timeout in seconds. + * @param timeout The discoverable timeout in seconds. */ public synchronized boolean setDiscoverableTimeout(int timeout) { mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, @@ -2565,12 +2565,12 @@ public class BluetoothService extends IBluetooth.Stub { /*package*/ String getAddressFromObjectPath(String objectPath) { String adapterObjectPath = getPropertyInternal("ObjectPath"); if (adapterObjectPath == null || objectPath == null) { - Log.e(TAG, "getAddressFromObjectPath: AdpaterObjectPath:" + adapterObjectPath + + Log.e(TAG, "getAddressFromObjectPath: AdapterObjectPath:" + adapterObjectPath + " or deviceObjectPath:" + objectPath + " is null"); return null; } if (!objectPath.startsWith(adapterObjectPath)) { - Log.e(TAG, "getAddressFromObjectPath: AdpaterObjectPath:" + adapterObjectPath + + Log.e(TAG, "getAddressFromObjectPath: AdapterObjectPath:" + adapterObjectPath + " is not a prefix of deviceObjectPath:" + objectPath + "bluetoothd crashed ?"); return null; |