commit 1f8b844870eb9acb334b541b0b41de37e000d2f0
author Nitin Shivpure <nshivpur@codeaurora.org> Thu Dec 12 20:03:49 2013 +0530
committer Andre Eisenbach <eisenbach@google.com> Tue Jun 02 01:23:11 2015 -0700
tree 6b764a7022454523321521046e7598e714b4d444
parent ac1f0a1a9169f8bbbddba68b0410d5530512da63

Bluetooth: Fix to avoid framework reboot during monkey testing

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

core/java/android/bluetooth/BluetoothPan.java

diff --git a/core/java/android/bluetooth/BluetoothPan.java b/core/java/android/bluetooth/BluetoothPan.java
index eb6166a..744f942 100644
--- a/core/java/android/bluetooth/BluetoothPan.java
+++ b/core/java/android/bluetooth/BluetoothPan.java
@@ -138,7 +138,6 @@
         }
         if (VDBG) Log.d(TAG, "BluetoothPan() call bindService");
         doBind();
-        if (VDBG) Log.d(TAG, "BluetoothPan(), bindService called");
     }
 
     boolean doBind() {
@@ -185,12 +184,22 @@
     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) {