| commit | 983faeed0b8090e12d10a31624e1cf09ff30c20c | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Tue Oct 16 15:03:26 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 16 15:03:27 2012 -0700 |
| tree | 47dc0c769185246ac96dfd2b946b9552b19a5aee | |
| parent | 3377b404b82403c4c137c699088eb09c4b806dba [diff] | |
| parent | 939caef712f306a1c80ea27e9f41ef6e3ea9e0f1 [diff] |
Merge "Fix NPE" into jb-mr1-dev
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 @@ protected void finalize() throws Throwable { try { - mHandler.getLooper().quit(); + if (mHandler != null && mHandler.getLooper() != null) { + mHandler.getLooper().quit(); + } } finally { super.finalize(); }