diff options
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionInfo.java | 8 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index d164c8851f5b..4b175c134d84 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -618,9 +618,9 @@ public class SubscriptionInfo implements Parcelable { @Deprecated public int getMcc() { try { - return mMcc == null ? 0 : Integer.parseInt(mMcc); + return TextUtils.isEmpty(mMcc) ? 0 : Integer.parseInt(mMcc); } catch (NumberFormatException e) { - Log.w(SubscriptionInfo.class.getSimpleName(), "MCC string is not a number"); + Log.w(SubscriptionInfo.class.getSimpleName(), "MCC string is not a number: " + mMcc); return 0; } } @@ -633,9 +633,9 @@ public class SubscriptionInfo implements Parcelable { @Deprecated public int getMnc() { try { - return mMnc == null ? 0 : Integer.parseInt(mMnc); + return TextUtils.isEmpty(mMnc) ? 0 : Integer.parseInt(mMnc); } catch (NumberFormatException e) { - Log.w(SubscriptionInfo.class.getSimpleName(), "MNC string is not a number"); + Log.w(SubscriptionInfo.class.getSimpleName(), "MNC string is not a number: " + mMnc); return 0; } } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 73ea68bc3547..504605d0a1a2 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -19432,7 +19432,6 @@ public class TelephonyManager { * and integrity algorithms in use * @hide */ - @FlaggedApi(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @SystemApi public void setNullCipherNotificationsEnabled(boolean enable) { @@ -19459,7 +19458,6 @@ public class TelephonyManager { * and integrity algorithms in use * @hide */ - @FlaggedApi(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @SystemApi public boolean isNullCipherNotificationsEnabled() { |