summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-10-16 13:24:19 -0700
committerIrfan Sheriff <isheriff@google.com>2012-10-16 13:24:19 -0700
commit939caef712f306a1c80ea27e9f41ef6e3ea9e0f1 (patch)
treef36f4dce41615ca8cb046a04181043ce3372fb65 /wifi
parenta30d969401a8533a5a341664421ba9b1e150bac3 (diff)
downloadframeworks_base-939caef712f306a1c80ea27e9f41ef6e3ea9e0f1.zip
frameworks_base-939caef712f306a1c80ea27e9f41ef6e3ea9e0f1.tar.gz
frameworks_base-939caef712f306a1c80ea27e9f41ef6e3ea9e0f1.tar.bz2
Fix NPE
Bug: 7357742 Change-Id: I4d12d137b9d5ebf5c6739cbd4405de3f90a3d846
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index e913d10..b871cdc 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1983,7 +1983,9 @@ public class WifiManager {
protected void finalize() throws Throwable {
try {
- mHandler.getLooper().quit();
+ if (mHandler != null && mHandler.getLooper() != null) {
+ mHandler.getLooper().quit();
+ }
} finally {
super.finalize();
}