From 409025ae5c7b9a6539d530272c713862a1adbf34 Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Mon, 14 Nov 2016 22:15:38 +0100 Subject: GsmCdmaPhone: Return dummy ICCID serial for NV sub In case of NV sub there's no ICC, so both getIccSerialNumber() and getFullIccSerialNumber() return null. Since getFullIccSerialNumber() is used to set/get the ID of each PhoneAccountHandle, devices with NV subs can't register proper phone accounts other than the emergency one. getIccSerialNumber() is instead used by CarrierConfigLoader to store and load configs. Fix both the problems forcing dummy serials for NV subscriptions. Change-Id: I610115e9d9f5b3b86b36fddcf13dbed6387e377c --- src/java/com/android/internal/telephony/GsmCdmaPhone.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java index 2c1030b1a..19b14c26a 100644 --- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java +++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java @@ -149,6 +149,7 @@ public class GsmCdmaPhone extends Phone { }; public static final String PROPERTY_CDMA_HOME_OPERATOR_NUMERIC = "ro.cdma.home.operator.numeric"; + private static final String DUMMY_NV_ICC_SERIAL = "DUMMY_NV_ICC_SERIAL"; //CDMALTE /** PHONE_TYPE_CDMA_LTE in addition to RuimRecords needs access to SIMRecords and @@ -740,6 +741,9 @@ public class GsmCdmaPhone extends Phone { @Override public String getIccSerialNumber() { + if (mCdmaSubscriptionSource == CDMA_SUBSCRIPTION_NV) { + return DUMMY_NV_ICC_SERIAL; + } IccRecords r = mIccRecords.get(); if (!isPhoneTypeGsm() && r == null) { // to get ICCID form SIMRecords because it is on MF. @@ -750,6 +754,9 @@ public class GsmCdmaPhone extends Phone { @Override public String getFullIccSerialNumber() { + if (mCdmaSubscriptionSource == CDMA_SUBSCRIPTION_NV) { + return DUMMY_NV_ICC_SERIAL; + } IccRecords r = mIccRecords.get(); if (!isPhoneTypeGsm() && r == null) { // to get ICCID form SIMRecords because it is on MF. -- cgit v1.2.3