Merge "Fix NPE" into jb-mr1-dev

Author: isheriff

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

@@ -1983,7 +1983,9 @@ public void captivePortalCheckComplete() {
 
     protected void finalize() throws Throwable {
         try {
-            mHandler.getLooper().quit();
+            if (mHandler != null && mHandler.getLooper() != null) {
+                mHandler.getLooper().quit();
+            }
         } finally {
             super.finalize();
         }