From 58fbffc36f71fbccbf510bfd17797760dc738133 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Sun, 15 Feb 2015 18:56:54 +0530 Subject: [PATCH] Bluetooth: Check for mPanService before changing tethering state Checking for mPanService before changing OR checking tethering state, otherwise it will lead to application crash while checking isTetheringOn OR changing tethering state. Change-Id: I00844c03cdb8616118c1d50d7d31c75e51f0ef9b --- core/java/android/bluetooth/BluetoothPan.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/core/java/android/bluetooth/BluetoothPan.java b/core/java/android/bluetooth/BluetoothPan.java index 4f81f9863c54..eb6166acee30 100644 --- a/core/java/android/bluetooth/BluetoothPan.java +++ b/core/java/android/bluetooth/BluetoothPan.java @@ -333,19 +333,25 @@ public final class BluetoothPan implements BluetoothProfile { public void setBluetoothTethering(boolean value) { if (DBG) log("setBluetoothTethering(" + value + ")"); - try { - mPanService.setBluetoothTethering(value); - } catch (RemoteException e) { - Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable())); + + if (mPanService != null && isEnabled()) { + try { + mPanService.setBluetoothTethering(value); + } catch (RemoteException e) { + Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable())); + } } } public boolean isTetheringOn() { if (VDBG) log("isTetheringOn()"); - try { - return mPanService.isTetheringOn(); - } catch (RemoteException e) { - Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable())); + + if (mPanService != null && isEnabled()) { + try { + return mPanService.isTetheringOn(); + } catch (RemoteException e) { + Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable())); + } } return false; } -- 2.11.0