Merge "Fix permission issue on channel" into jb-mr1-dev

1 files changed, 8 insertions, 2 deletions

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 3579b86..284bee8 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1358,7 +1358,11 @@ public class WifiManager {
 
     private void init() {
         mWifiServiceMessenger = getWifiServiceMessenger();
-        if (mWifiServiceMessenger == null) throw new RuntimeException("Failed to initialize");
+        if (mWifiServiceMessenger == null) {
+            mAsyncChannel = null;
+            return;
+        }
+
         HandlerThread t = new HandlerThread("WifiManager");
         t.start();
         mHandler = new ServiceHandler(t.getLooper());
@@ -1372,7 +1376,7 @@ public class WifiManager {
 
     private void validateChannel() {
         if (mAsyncChannel == null) throw new IllegalStateException(
-                "Bad WifiManager instance state, re-initialize");
+                "No permission to access and change wifi or a bad initialization");
     }
 
     /**
@@ -1517,6 +1521,8 @@ public class WifiManager {
             return mService.getWifiServiceMessenger();
         } catch (RemoteException e) {
             return null;
+        } catch (SecurityException e) {
+            return null;
         }
     }