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

Commit 335e40c0 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Use seperate config file for p2p"

parents 35c0bf31 f42c39b3

core/jni/android_net_wifi_Wifi.cpp

+6 −0
Original line number Diff line number Diff line
@@ -124,6 +124,11 @@ static jboolean android_net_wifi_startSupplicant(JNIEnv* env, jobject) 
    return (jboolean)(::wifi_start_supplicant() == 0);

}



static jboolean android_net_wifi_startP2pSupplicant(JNIEnv* env, jobject)

{

    return (jboolean)(::wifi_start_p2p_supplicant() == 0);

}



static jboolean android_net_wifi_stopSupplicant(JNIEnv* env, jobject)

{

    return doBooleanCommand("OK", "TERMINATE");
@@ -581,6 +586,7 @@ static JNINativeMethod gWifiMethods[] = { 
    { "isDriverLoaded", "()Z",  (void *)android_net_wifi_isDriverLoaded},

    { "unloadDriver", "()Z",  (void *)android_net_wifi_unloadDriver },

    { "startSupplicant", "()Z",  (void *)android_net_wifi_startSupplicant },

    { "startP2pSupplicant", "()Z",  (void *)android_net_wifi_startP2pSupplicant },

    { "stopSupplicant", "()Z", (void*) android_net_wifi_stopSupplicant },

    { "killSupplicant", "()Z",  (void *)android_net_wifi_killSupplicant },

    { "connectToSupplicant", "()Z",  (void *)android_net_wifi_connectToSupplicant },

wifi/java/android/net/wifi/WifiNative.java

+3 −1
Original line number Diff line number Diff line
@@ -60,7 +60,9 @@ public class WifiNative { 


    public native static boolean startSupplicant();



    /* Does a graceful shutdown of supplicant.

    public native static boolean startP2pSupplicant();



    /* Does a graceful shutdown of supplicant. Is a common stop function for both p2p and sta.

     *

     * Note that underneath we use a harsh-sounding "terminate" supplicant command

     * for a graceful stop and a mild-sounding "stop" interface

wifi/java/android/net/wifi/p2p/WifiP2pService.java

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub { 
                        if (DBG) Slog.w(TAG, "Unable to bring down wlan interface: " + e);

                    }



                    if (WifiNative.startSupplicant()) {

                    if (WifiNative.startP2pSupplicant()) {

                        mWifiMonitor.startMonitoring();

                        transitionTo(mP2pEnablingState);

                    } else {