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

Commit e97d1c6a authored by Nathan Harold's avatar Nathan Harold
Browse files

Remove dependency on IccConstants from SmsManager 

-Redefine the length of the SmsRecord in SmsManager

Bug: 33414487
Test: compilation
Change-Id: I941085e96f45164152528c123102a59930859546
parent 4980bf4a

telephony/java/android/telephony/SmsManager.java

+11 −2
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ import android.util.Log; 
import com.android.internal.telephony.IMms;

import com.android.internal.telephony.IMms;

import com.android.internal.telephony.ISms;

import com.android.internal.telephony.ISms;

import com.android.internal.telephony.SmsRawData;

import com.android.internal.telephony.SmsRawData;

import com.android.internal.telephony.uicc.IccConstants;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;
@@ -72,6 +71,16 @@ public final class SmsManager { 
    /** @hide */

    /** @hide */

    public static final int CELL_BROADCAST_RAN_TYPE_CDMA = 1;

    public static final int CELL_BROADCAST_RAN_TYPE_CDMA = 1;





    /** SMS record length from TS 51.011 10.5.3

     * @hide

     */

    public static final int SMS_RECORD_LENGTH = 176;



    /** SMS record length from C.S0023 3.4.27

     * @hide

     */

    public static final int CDMA_SMS_RECORD_LENGTH = 255;



    private static final Map<Integer, SmsManager> sSubInstances =

    private static final Map<Integer, SmsManager> sSubInstances =

            new ArrayMap<Integer, SmsManager>();

            new ArrayMap<Integer, SmsManager>();
@@ -744,7 +753,7 @@ public final class SmsManager { 
    public boolean

    public boolean

    deleteMessageFromIcc(int messageIndex) {

    deleteMessageFromIcc(int messageIndex) {

        boolean success = false;

        boolean success = false;

        byte[] pdu = new byte[IccConstants.SMS_RECORD_LENGTH-1];

        byte[] pdu = new byte[SMS_RECORD_LENGTH-1];

        Arrays.fill(pdu, (byte)0xff);

        Arrays.fill(pdu, (byte)0xff);





        try {

        try {