Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(793)

Unified Diff: net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java

Issue 1688103002: Revert of Native SSID extraction moved to platform code on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/android/network_library.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
diff --git a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
index 0bc19588e4d78fdbee64c095b201da351c40ca48..96a9320a81f431929b838d4f33557bff59a21ed4 100644
--- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
+++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
@@ -9,8 +9,6 @@
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
import android.security.KeyChain;
import android.telephony.TelephonyManager;
import android.util.Log;
@@ -230,34 +228,4 @@
NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
return networkInfo.isRoaming();
}
-
- /*
- * Returns the current SSID if the device is connected to a Wi-Fi network.
- */
- @CalledByNative
- private static String getWifiSSID(Context context) {
- WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-
- if (wifiInfo == null) {
- return "";
- }
-
- String ssid = wifiInfo.getSSID();
-
- if (ssid == null || "<unknown ssid>".equals(ssid)) {
- return "";
- }
-
- return removeSurroundingQuotes(ssid);
- }
-
- private static String removeSurroundingQuotes(String string) {
- if (string.length() > 2 && string.charAt(0) == '\"'
- && string.charAt(string.length() - 1) == '\"') {
- return string.substring(1, string.length() - 1);
- }
-
- return string;
- }
}
« no previous file with comments | « no previous file | net/android/network_library.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698