diff options
| author | 2012-10-16 15:03:26 -0700 | |
|---|---|---|
| committer | 2012-10-16 15:03:27 -0700 | |
| commit | 983faeed0b8090e12d10a31624e1cf09ff30c20c (patch) | |
| tree | 47dc0c769185246ac96dfd2b946b9552b19a5aee | |
| parent | 3377b404b82403c4c137c699088eb09c4b806dba (diff) | |
| parent | 939caef712f306a1c80ea27e9f41ef6e3ea9e0f1 (diff) | |
Merge "Fix NPE" into jb-mr1-dev
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 4 |
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 e913d10c52b4..b871cdca9f5a 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(); } |