| 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 472c0f771852ebdbddf1b789d480958dfe03bda2..6b913186e9a11ed8fe252712cc6bffe371d7c547 100644
|
| --- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
|
| +++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
|
| @@ -245,12 +245,10 @@ class AndroidNetworkLibrary {
|
| */
|
| @CalledByNative
|
| private static String getNetworkCountryIso(Context context) {
|
| - TelephonyManager telephonyManager =
|
| - (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
| - if (telephonyManager != null) {
|
| + TelephonyManager telephonyManager =
|
| + (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
| + if (telephonyManager == null) return "";
|
| return telephonyManager.getNetworkCountryIso();
|
| - }
|
| - return "";
|
| }
|
|
|
| /**
|
| @@ -259,12 +257,10 @@ class AndroidNetworkLibrary {
|
| */
|
| @CalledByNative
|
| private static String getNetworkOperator(Context context) {
|
| - TelephonyManager telephonyManager =
|
| - (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
| - if (telephonyManager != null) {
|
| + TelephonyManager telephonyManager =
|
| + (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
| + if (telephonyManager == null) return "";
|
| return telephonyManager.getNetworkOperator();
|
| - }
|
| - return "";
|
| }
|
|
|
| }
|
|
|