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

Commit 3ef96973 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 8fc5a63d: Merge change 2431 into donut 

Merge commit '8fc5a63d'

* commit '8fc5a63d':
  wifi: Fix problem parsing RSSI when the AP name contains a space.
parents de6d6546 8fc5a63d

core/jni/android_net_wifi_Wifi.cpp

+6 −1
Original line number Diff line number Diff line
@@ -317,8 +317,13 @@ static jint android_net_wifi_getRssiCommand(JNIEnv* env, jobject clazz) 
    }

    // reply comes back in the form "<SSID> rssi XX" where XX is the

    // number we're interested in.  if we're associating, it returns "OK".

    // beware - <SSID> can contain spaces.

    if (strcmp(reply, "OK") != 0) {

    	sscanf(reply, "%*s %*s %d", &rssi);

        char* lastSpace = strrchr(reply, ' ');

        // lastSpace should be preceded by "rssi" and followed by the value

        if (lastSpace && !strncmp(lastSpace - 4, "rssi", 4)) {

            sscanf(lastSpace + 1, "%d", &rssi);

        }

    }

    return (jint)rssi;

}