Use boolean instead of int parameter for toggleInterface()

WifiNative::toggleInterface() is using an int parameter for setting
interface up/down. It should be boolean instead.
This CL also renames toggleInterface() to setInterfaceUp().

BUG=27704936
TEST=compile, manually tested on bullhead

Change-Id: I88a98d3e4e53c95921d519db685886a3535dab9e

3 files changed, 12 insertions, 12 deletions

diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index 570d1f88a..04be72fd7 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -2467,11 +2467,11 @@ public class WifiNative {
         }
     }
 
-    private static native boolean toggleInterfaceNative(int on);
-    public boolean toggleInterface(int on) {
+    private static native boolean setInterfaceUpNative(boolean up);
+    public boolean setInterfaceUp(boolean up) {
         synchronized (sLock) {
             if (isHalStarted()) {
-                return toggleInterfaceNative(on);
+                return setInterfaceUpNative(up);
             } else {
                 return false;
             }
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 415d0fd1f..d87df6c1f 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4605,12 +4605,12 @@ public class WifiStateMachine extends StateMachine implements WifiNative.PnoEven
 
         int index = mWifiNative.queryInterfaceIndex(mInterfaceName);
         if (index != -1) {
-            if (!mWifiNative.toggleInterface(0)) {
+            if (!mWifiNative.setInterfaceUp(false)) {
                 Log.e(TAG, "toggleInterface failed");
                 return false;
             }
         } else {
-            if (DBG) Log.d(TAG, "No interfaces to toggle");
+            if (DBG) Log.d(TAG, "No interfaces to bring down");
         }
 
         try {
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index 5b38495ab..db09c7727 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -230,7 +230,7 @@ static JNIObject<jobject> createScanResult(JNIHelper &helper, wifi_scan_result *
     return scanResult;
 }
 
-int set_iface_flags(const char *ifname, int dev_up) {
+int set_iface_flags(const char *ifname, bool dev_up) {
     struct ifreq ifr;
     int ret;
     int sock = socket(PF_INET, SOCK_DGRAM, 0);
@@ -283,8 +283,8 @@ int set_iface_flags(const char *ifname, int dev_up) {
     return 0;
 }
 
-static jboolean android_net_wifi_toggle_interface(JNIEnv* env, jclass cls, int toggle) {
-    return(set_iface_flags("wlan0", toggle) == 0);
+static jboolean android_net_wifi_set_interface_up(JNIEnv* env, jclass cls, jboolean up) {
+    return (set_iface_flags("wlan0", (bool)up) == 0);
 }
 
 static jboolean android_net_wifi_startHal(JNIEnv* env, jclass cls) {
@@ -303,7 +303,7 @@ static jboolean android_net_wifi_startHal(JNIEnv* env, jclass cls) {
 	    return false;
         }
 
-        int ret = set_iface_flags("wlan0", 1);
+        int ret = set_iface_flags("wlan0", true);
         if(ret != 0) {
             return false;
         }
@@ -318,7 +318,7 @@ static jboolean android_net_wifi_startHal(JNIEnv* env, jclass cls) {
         ALOGD("halHandle = %p, mVM = %p, mCls = %p", halHandle, mVM, mCls);
         return res == WIFI_SUCCESS;
     } else {
-        return (set_iface_flags("wlan0", 1) == 0);
+        return (set_iface_flags("wlan0", true) == 0);
     }
 }
 
@@ -352,7 +352,7 @@ static void android_net_wifi_waitForHalEvents(JNIEnv* env, jclass cls) {
     JNIHelper helper(env);
     wifi_handle halHandle = getWifiHandle(helper, cls);
     hal_fn.wifi_event_loop(halHandle);
-    set_iface_flags("wlan0", 0);
+    set_iface_flags("wlan0", false);
 }
 
 static int android_net_wifi_getInterfaces(JNIEnv *env, jclass cls) {
@@ -2316,7 +2316,7 @@ static JNINativeMethod gWifiMethods[] = {
     { "setScanningMacOuiNative", "(I[B)Z",  (void*) android_net_wifi_setScanningMacOui},
     { "getChannelsForBandNative", "(II)[I", (void*) android_net_wifi_getValidChannels},
     { "setDfsFlagNative",         "(IZ)Z",  (void*) android_net_wifi_setDfsFlag},
-    { "toggleInterfaceNative",    "(I)Z",  (void*) android_net_wifi_toggle_interface},
+    { "setInterfaceUpNative", "(Z)Z",  (void*) android_net_wifi_set_interface_up},
     { "getRttCapabilitiesNative", "(I)Landroid/net/wifi/RttManager$RttCapabilities;",
             (void*) android_net_wifi_get_rtt_capabilities},
     { "getPacketFilterCapabilitiesNative", "(I)Lcom/android/server/wifi/WifiNative$PacketFilterCapabilities;",