Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Kick Bluetooth stack after user is unlocked." into nyc-dev

Browse Source 
am: 3457871799

* commit '3457871799a81644711d7d3c302f0d34d2f2e591':
  Kick Bluetooth stack after user is unlocked.
This commit is contained in:
Jeff Sharkey
2016-03-05 22:31:46 +00:00
committed by android-build-merger
parent 75ba62e11a 3457871799
commit e741feb79b
2 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -89,14 +89,15 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
private static final int MESSAGE_BLUETOOTH_SERVICE_CONNECTED = 40; private static final int MESSAGE_BLUETOOTH_SERVICE_CONNECTED = 40;
private static final int MESSAGE_BLUETOOTH_SERVICE_DISCONNECTED = 41; private static final int MESSAGE_BLUETOOTH_SERVICE_DISCONNECTED = 41;
private static final int MESSAGE_RESTART_BLUETOOTH_SERVICE = 42; private static final int MESSAGE_RESTART_BLUETOOTH_SERVICE = 42;
private static final int MESSAGE_BLUETOOTH_STATE_CHANGE=60; private static final int MESSAGE_BLUETOOTH_STATE_CHANGE = 60;
private static final int MESSAGE_TIMEOUT_BIND =100; private static final int MESSAGE_TIMEOUT_BIND = 100;
private static final int MESSAGE_TIMEOUT_UNBIND =101; private static final int MESSAGE_TIMEOUT_UNBIND = 101;
private static final int MESSAGE_USER_SWITCHED = 300; private static final int MESSAGE_USER_SWITCHED = 300;
private static final int MESSAGE_USER_UNLOCKED = 301;
private static final int MESSAGE_ADD_PROXY_DELAYED = 400; private static final int MESSAGE_ADD_PROXY_DELAYED = 400;
private static final int MESSAGE_BIND_PROFILE_SERVICE = 401; private static final int MESSAGE_BIND_PROFILE_SERVICE = 401;
private static final int MAX_SAVE_RETRIES=3; private static final int MAX_SAVE_RETRIES = 3;
private static final int MAX_ERROR_RESTART_RETRIES=6; private static final int MAX_ERROR_RESTART_RETRIES = 6;
// Bluetooth persisted setting is off // Bluetooth persisted setting is off
private static final int BLUETOOTH_OFF=0; private static final int BLUETOOTH_OFF=0;
@@ -767,8 +768,16 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
* Called when switching to a different foreground user. * Called when switching to a different foreground user.
*/ */
public void handleOnSwitchUser(int userHandle) { public void handleOnSwitchUser(int userHandle) {
if (DBG) Slog.d(TAG, "Bluetooth user switched"); if (DBG) Slog.d(TAG, "User " + userHandle + " switched");
mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_USER_SWITCHED, userHandle, 0)); mHandler.obtainMessage(MESSAGE_USER_SWITCHED, userHandle, 0).sendToTarget();
}
/**
* Called when user is unlocked.
*/
public void handleOnUnlockUser(int userHandle) {
if (DBG) Slog.d(TAG, "User " + userHandle + " unlocked");
mHandler.obtainMessage(MESSAGE_USER_UNLOCKED, userHandle, 0).sendToTarget();
} }
/** /**
@@ -1308,12 +1317,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
break; break;
} }
case MESSAGE_USER_SWITCHED: case MESSAGE_USER_SWITCHED: {
{ if (DBG) Slog.d(TAG, "MESSAGE_USER_SWITCHED");
if (DBG) {
Slog.d(TAG, "MESSAGE_USER_SWITCHED");
}
mHandler.removeMessages(MESSAGE_USER_SWITCHED); mHandler.removeMessages(MESSAGE_USER_SWITCHED);
/* disable and enable BT when detect a user switch */ /* disable and enable BT when detect a user switch */
if (mEnable && mBluetooth != null) { if (mEnable && mBluetooth != null) {
synchronized (mConnection) { synchronized (mConnection) {
@@ -1381,6 +1388,20 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
} }
break; break;
} }
case MESSAGE_USER_UNLOCKED: {
if (DBG) Slog.d(TAG, "MESSAGE_USER_UNLOCKED");
mHandler.removeMessages(MESSAGE_USER_SWITCHED);
synchronized (mConnection) {
if (mEnable && !mBinding && (mBluetooth == null)) {
// We should be connected, but we gave up for some
// reason; maybe the Bluetooth service wasn't encryption
// aware, so try binding again.
if (DBG) Slog.d(TAG, "Enabled but not bound; retrying after unlock");
handleEnable(mQuietEnable);
}
}
}
} }
} }
} }

13
services/core/java/com/android/server/BluetoothService.java
View File

@@ -18,10 +18,8 @@ package com.android.server;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.content.Context; import android.content.Context;
import android.util.Log;
class BluetoothService extends SystemService { class BluetoothService extends SystemService {
private static final String TAG = "BluetoothService";
private BluetoothManagerService mBluetoothManagerService; private BluetoothManagerService mBluetoothManagerService;
public BluetoothService(Context context) { public BluetoothService(Context context) {
@@ -36,17 +34,20 @@ class BluetoothService extends SystemService {
@Override @Override
public void onBootPhase(int phase) { public void onBootPhase(int phase) {
if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) { if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
Log.d(TAG, "onBootPhase: PHASE_SYSTEM_SERVICES_READY"); publishBinderService(BluetoothAdapter.BLUETOOTH_MANAGER_SERVICE,
publishBinderService(BluetoothAdapter.BLUETOOTH_MANAGER_SERVICE, mBluetoothManagerService); mBluetoothManagerService);
} else if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY) { } else if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY) {
Log.d(TAG, "onBootPhase: PHASE_ACTIVITY_MANAGER_READY");
mBluetoothManagerService.handleOnBootPhase(); mBluetoothManagerService.handleOnBootPhase();
} }
} }
@Override @Override
public void onSwitchUser(int userHandle) { public void onSwitchUser(int userHandle) {
Log.d(TAG, "onSwitchUser: switching to user " + userHandle);
mBluetoothManagerService.handleOnSwitchUser(userHandle); mBluetoothManagerService.handleOnSwitchUser(userHandle);
} }
@Override
public void onUnlockUser(int userHandle) {
mBluetoothManagerService.handleOnUnlockUser(userHandle);
}
} }