commit c741f5c13d5976289289b65ce3c1e7b71be4c266
author Irfan Sheriff <isheriff@google.com> Tue Oct 16 15:06:33 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 16 15:06:33 2012 -0700
tree ce0ada16f644bede9e06107c86979915fc5abdf3
parent 142155b5cec5dfbde4a875828505cd1434df0d2b
parent 983faeed0b8090e12d10a31624e1cf09ff30c20c

am 983faeed: Merge "Fix NPE" into jb-mr1-dev

* commit '983faeed0b8090e12d10a31624e1cf09ff30c20c':
  Fix NPE

wifi/java/android/net/wifi/WifiManager.java

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();
         }