summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/bluetooth
diff options
context:
space:
mode:
authorVenkata Jagadeesh <vjagad@codeaurora.org>2014-11-20 16:19:15 +0530
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:21:09 -0600
commitc76d11dd90e028216d76a0211e3db7260b6f197c (patch)
treeb38496655a503c1f67201fbd5ba6f834e1c71a94 /src/com/android/settings/bluetooth
parent6f5528f4cb61d5619f7ddf3cd1ae8c74fe1de0da (diff)
downloadpackages_apps_Settings-c76d11dd90e028216d76a0211e3db7260b6f197c.zip
packages_apps_Settings-c76d11dd90e028216d76a0211e3db7260b6f197c.tar.gz
packages_apps_Settings-c76d11dd90e028216d76a0211e3db7260b6f197c.tar.bz2
Bluetooth: GAP: Handled Null pointer deference in unregisterReceiver
Handled Null pointer deference in unregisterReceiver event of pairing dialog Change-Id: Ie0d0561cb3c0f09a018e1aeb20579700c6e8d783 CRs-fixed: 761872
Diffstat (limited to 'src/com/android/settings/bluetooth')
-rwxr-xr-xsrc/com/android/settings/bluetooth/BluetoothPairingDialog.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 7fa31b3..bd35bd7 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -363,7 +363,9 @@ public final class BluetoothPairingDialog extends AlertActivity implements
@Override
protected void onDestroy() {
super.onDestroy();
- unregisterReceiver(mReceiver);
+ if (mReceiver != null) {
+ unregisterReceiver(mReceiver);
+ }
}
public void afterTextChanged(Editable s) {