diff options
| author | Matthew Xie <mattx@google.com> | 2012-10-04 23:21:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-04 23:21:34 -0700 |
| commit | d21b483904057212ab1654b8ef606d41f2d3fe46 (patch) | |
| tree | 937d2de9cc5a786bee99aedbe208da71dc83a86d /services/java | |
| parent | efd7b26797cc64be0d1156f7ba15b5c6b99597e0 (diff) | |
| parent | fca9d63635d9603c318a089397b23c17682453e3 (diff) | |
| download | frameworks_base-d21b483904057212ab1654b8ef606d41f2d3fe46.zip frameworks_base-d21b483904057212ab1654b8ef606d41f2d3fe46.tar.gz frameworks_base-d21b483904057212ab1654b8ef606d41f2d3fe46.tar.bz2 | |
Merge "Add multi user support for bluetooth" into jb-mr1-dev
Diffstat (limited to 'services/java')
| -rwxr-xr-x | services/java/com/android/server/BluetoothManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/BluetoothManagerService.java b/services/java/com/android/server/BluetoothManagerService.java index ce75e35..e7cd279 100755 --- a/services/java/com/android/server/BluetoothManagerService.java +++ b/services/java/com/android/server/BluetoothManagerService.java @@ -481,7 +481,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { mHandler.sendMessageDelayed(timeoutMsg,TIMEOUT_BIND_MS); Intent i = new Intent(IBluetooth.class.getName()); if (!mContext.bindService(i, mConnection, - Context.BIND_AUTO_CREATE)) { + Context.BIND_AUTO_CREATE, UserHandle.USER_CURRENT)) { mHandler.removeMessages(MESSAGE_TIMEOUT_BIND); Log.e(TAG, "fail to bind to: " + IBluetooth.class.getName()); } @@ -717,7 +717,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { mHandler.sendMessageDelayed(timeoutMsg,TIMEOUT_BIND_MS); mConnection.setGetNameAddressOnly(false); Intent i = new Intent(IBluetooth.class.getName()); - if (!mContext.bindService(i, mConnection,Context.BIND_AUTO_CREATE)) { + if (!mContext.bindService(i, mConnection, Context.BIND_AUTO_CREATE, + UserHandle.USER_CURRENT)) { mHandler.removeMessages(MESSAGE_TIMEOUT_BIND); Log.e(TAG, "Fail to bind to: " + IBluetooth.class.getName()); } |