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

Bluetooth: Fix to avoid framework reboot during monkey testing

Browse Source 
When running monkeyrunner, sometimes the framework is disconnected due
to an unhandled Java exception while binding the PAN service (when it
is unsuccessful). Handing the Java exception while binding PAN service
solves this issue.

Change-Id: Idea710593a3f9496305f636042605303e73e7749
This commit is contained in:
Nitin Shivpure
2013-12-12 20:03:49 +05:30
committed by Andre Eisenbach
parent ac1f0a1a91
commit 1f8b844870
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");
doBind();
if (VDBG) Log.d(TAG, "BluetoothPan(), bindService called");
}
boolean doBind() {
@@ -185,12 +184,22 @@ public final class BluetoothPan implements BluetoothProfile {
final private IBluetoothStateChangeCallback mStateChangeCallback = new IBluetoothStateChangeCallback.Stub() {
@Override
public void onBluetoothStateChange(boolean on) throws RemoteException {
//Handle enable request to bind again.
public void onBluetoothStateChange(boolean on) {
// Handle enable request to bind again.
Log.d(TAG, "onBluetoothStateChange on: " + on);
if (on) {
Log.d(TAG, "onBluetoothStateChange(on) call bindService");
doBind();
if (VDBG) Log.d(TAG, "BluetoothPan(), bindService called");
try {
if (mPanService == null) {
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 {
if (VDBG) Log.d(TAG,"Unbinding service...");
synchronized (mConnection) {