Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5af6cdd6 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 7ac8d802: Merge "Telephony: Fixed problem with short operator name" 

* commit '7ac8d802':
  Telephony: Fixed problem with short operator name
parents 380be4a4 7ac8d802

src/java/com/android/internal/telephony/gsm/SIMRecords.java

+2 −4
Original line number Diff line number Diff line
@@ -1519,8 +1519,7 @@ public class SIMRecords extends IccRecords { 
            case READ_SPN_CPHS:

                if (ar != null && ar.exception == null) {

                    data = (byte[]) ar.result;

                    spn = IccUtils.adnStringFieldToString(

                            data, 0, data.length - 1 );

                    spn = IccUtils.adnStringFieldToString(data, 0, data.length);



                    if (DBG) log("Load EF_SPN_CPHS: " + spn);

                    SystemProperties.set(PROPERTY_ICC_OPERATOR_ALPHA, spn);
@@ -1537,8 +1536,7 @@ public class SIMRecords extends IccRecords { 
            case READ_SPN_SHORT_CPHS:

                if (ar != null && ar.exception == null) {

                    data = (byte[]) ar.result;

                    spn = IccUtils.adnStringFieldToString(

                            data, 0, data.length - 1);

                    spn = IccUtils.adnStringFieldToString(data, 0, data.length);



                    if (DBG) log("Load EF_SPN_SHORT_CPHS: " + spn);

                    SystemProperties.set(PROPERTY_ICC_OPERATOR_ALPHA, spn);