| Index: content/public/android/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/common/DeviceTelephonyInfo.java b/content/public/android/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
|
| index 64a8fb448d556c8ab535605d748758203cc7927d..ce55400a183972f522c76e5f53503cc29a5311c3 100644
|
| --- a/content/public/android/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
|
| +++ b/content/public/android/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
|
| @@ -27,7 +27,22 @@ public class DeviceTelephonyInfo {
|
| */
|
| @CalledByNative
|
| public String getNetworkCountryIso() {
|
| - return mTelManager.getNetworkCountryIso();
|
| + if (mTelManager != null) {
|
| + return mTelManager.getNetworkCountryIso();
|
| + }
|
| + return "";
|
| + }
|
| +
|
| + /**
|
| + * @return MCC+MNC (mobile country code + mobile network code) as
|
| + * the numeric name of the current registered operator.
|
| + */
|
| + @CalledByNative
|
| + public String getNetworkOperator() {
|
| + if (mTelManager != null) {
|
| + return mTelManager.getNetworkOperator();
|
| + }
|
| + return "";
|
| }
|
|
|
| /**
|
|
|