diff options
author | Irfan Sheriff <isheriff@google.com> | 2012-08-23 16:57:43 -0700 |
---|---|---|
committer | Irfan Sheriff <isheriff@google.com> | 2012-08-23 16:57:43 -0700 |
commit | 35bbe27d58ccf01ffd170b0f617a568bc843a49e (patch) | |
tree | 8721ed8eb7463d9eee1ac3d7f0cce8cf643ff98c /wifi | |
parent | de1d96c736730c2a99a225311b9211a34042f9d4 (diff) | |
download | frameworks_base-35bbe27d58ccf01ffd170b0f617a568bc843a49e.zip frameworks_base-35bbe27d58ccf01ffd170b0f617a568bc843a49e.tar.gz frameworks_base-35bbe27d58ccf01ffd170b0f617a568bc843a49e.tar.bz2 |
Fix permission issue on channel
Change-Id: I57f5d128dc2e2aa3bff93e82456f73cb96851f82
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 10 |
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; } } |