Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9e2fa9f authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert "Wifi: Introduce additional APIs to support STA + SoftAp concurrency" 

This reverts commit b8166563.

Change-Id: I064cdefba17f03bd09ed0213340eda35bff380a0
parent 1d9bcaff

core/java/android/os/INetworkManagementService.aidl

+0 −9
Original line number Diff line number Diff line
@@ -455,13 +455,4 @@ interface INetworkManagementService 
    int removeRoutesFromLocalNetwork(in List<RouteInfo> routes);



    void setAllowOnlyVpnForUids(boolean enable, in UidRange[] uidRanges);

    /**

     * Create SoftAp Interface

     */

    void createSoftApInterface(String wlanIface);



     /**

     * Delete SoftAp Interface

     */

    void deleteSoftApInterface(String wlanIface);

}

services/core/java/com/android/server/NetworkManagementService.java

+0 −20
Original line number Diff line number Diff line
@@ -1256,26 +1256,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        }

    }



    @Override

    public void createSoftApInterface(String wlanIface) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        try {

            mConnector.execute("softap", "create", wlanIface);

        } catch (NativeDaemonConnectorException e) {

            throw e.rethrowAsParcelableException();

        }

    }



    @Override

    public void deleteSoftApInterface(String wlanIface) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        try {

            mConnector.execute("softap", "remove", wlanIface);

        } catch (NativeDaemonConnectorException e) {

            throw e.rethrowAsParcelableException();

        }

    }



    @Override

    public void startTethering(String[] dhcpRange) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

wifi/java/android/net/wifi/IWifiManager.aidl

+0 −2
Original line number Diff line number Diff line
@@ -169,7 +169,5 @@ interface IWifiManager 
    void factoryReset();



    Network getCurrentNetwork();



    boolean getWifiStaSapConcurrency();

}

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

+0 −15
Original line number Diff line number Diff line
@@ -2689,21 +2689,6 @@ public class WifiManager { 
        }

    }



    /**

     * get concurrency support

     *

     * @return true if concurrency is allowed.

     *

     * @hide no intent to publish

     */

    public boolean getWifiStaSapConcurrency() {

        try {

            return mService.getWifiStaSapConcurrency();

        } catch (RemoteException e) {

             throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Resets all wifi manager settings back to factory defaults.

     *