From 94f77dbb025f0182f2fe816b2a00ffa1cd2becfc Mon Sep 17 00:00:00 2001
From: Navtej Singh Mann <navtejsingh@google.com>
Date: Wed, 9 Apr 2014 18:06:37 -0700
Subject: [PATCH] Fixed bypass of ConnectivityInternal permission

Removed public function 'getWifiStateMachineMessenger' of
WifiManager to fix bypass of ConnectivityInternal permission
by application, which is security concern

Bug: 13749822

Change-Id: I3ae73e33b77ee8ae0133ca9dc8cc03c504f09e40
---
 wifi/java/android/net/wifi/IWifiManager.aidl |  2 --
 wifi/java/android/net/wifi/WifiManager.java  | 12 ------------
 2 files changed, 14 deletions(-)

diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 0535fe0e7e56e..9ccd810913192 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -111,8 +111,6 @@ interface IWifiManager
 
     Messenger getWifiServiceMessenger();
 
-    Messenger getWifiStateMachineMessenger();
-
     String getConfigFile();
 
     void enableTdls(String remoteIPAddress, boolean enable);
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 15b65c10a033a..9558d50b6d4b9 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1783,18 +1783,6 @@ public class WifiManager {
         }
     }
 
-    /**
-     * Get a reference to WifiStateMachine handler.
-     * @return Messenger pointing to the WifiService handler
-     * @hide
-     */
-    public Messenger getWifiStateMachineMessenger() {
-        try {
-            return mService.getWifiStateMachineMessenger();
-        } catch (RemoteException e) {
-            return null;
-        }
-    }
 
     /**
      * Returns the file in which IP and proxy configuration data is stored