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

am 305c1941: am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing

Browse Source 
* commit '305c19412544f7dc5ce38d1f7949f9fc9acf47bd':
  Bluetooth: Fix to avoid framework reboot during monkey testing
This commit is contained in:
Nitin Shivpure
2015-06-02 14:24:58 +00:00
committed by Android Git Automerger
parent d3681f7c3b 305c194125
commit 39e04519ca
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/bluetooth/BluetoothPan.java
View File

@@ -138,7 +138,6 @@ public final class BluetoothPan implements BluetoothProfile {
} }
if (VDBG) Log.d(TAG, "BluetoothPan() call bindService"); if (VDBG) Log.d(TAG, "BluetoothPan() call bindService");
doBind(); doBind();
if (VDBG) Log.d(TAG, "BluetoothPan(), bindService called");
} }
boolean doBind() { boolean doBind() {
@@ -185,12 +184,22 @@ public final class BluetoothPan implements BluetoothProfile {
final private IBluetoothStateChangeCallback mStateChangeCallback = new IBluetoothStateChangeCallback.Stub() { final private IBluetoothStateChangeCallback mStateChangeCallback = new IBluetoothStateChangeCallback.Stub() {
@Override @Override
public void onBluetoothStateChange(boolean on) throws RemoteException { public void onBluetoothStateChange(boolean on) {
//Handle enable request to bind again. // Handle enable request to bind again.
Log.d(TAG, "onBluetoothStateChange on: " + on);
if (on) { if (on) {
Log.d(TAG, "onBluetoothStateChange(on) call bindService"); try {
doBind(); if (mPanService == null) {
if (VDBG) Log.d(TAG, "BluetoothPan(), bindService called"); if (VDBG) Log.d(TAG, "onBluetoothStateChange calling doBind()");
doBind();
}
} catch (IllegalStateException e) {
Log.e(TAG,"onBluetoothStateChange: could not bind to PAN service: ", e);
} catch (SecurityException e) {
Log.e(TAG,"onBluetoothStateChange: could not bind to PAN service: ", e);
}
} else { } else {
if (VDBG) Log.d(TAG,"Unbinding service..."); if (VDBG) Log.d(TAG,"Unbinding service...");
synchronized (mConnection) { synchronized (mConnection) {