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

Commit bcd57322 authored by Jake Hamby's avatar Jake Hamby
Browse files

Fix some more typos, remove unused imports, and remove unnecessary cast. 

More minor code cleanups in the telephony framework.

Change-Id: I27abe11e02fc6fea12885eea4fe275240a546332
parent 43a869f3

telephony/java/android/telephony/PhoneNumberUtils.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -586,7 +586,7 @@ public class PhoneNumberUtils 
            }

            }

        } else {

        } else {

            // In the US, 1-650-555-1234 must be equal to 650-555-1234,

            // In the US, 1-650-555-1234 must be equal to 650-555-1234,

            // while 090-1234-1234 must not be equalt to 90-1234-1234 in Japan.

            // while 090-1234-1234 must not be equal to 90-1234-1234 in Japan.

            // This request exists just in US (with 1 trunk (NDD) prefix).

            // This request exists just in US (with 1 trunk (NDD) prefix).

            // In addition, "011 11 7005554141" must not equal to "+17005554141",

            // In addition, "011 11 7005554141" must not equal to "+17005554141",

            // while "011 1 7005554141" must equal to "+17005554141"

            // while "011 1 7005554141" must equal to "+17005554141"

telephony/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -67,8 +67,7 @@ public class RuimSmsInterfaceManager extends IccSmsInterfaceManager { 
                    ar = (AsyncResult)msg.obj;

                    ar = (AsyncResult)msg.obj;

                    synchronized (mLock) {

                    synchronized (mLock) {

                        if (ar.exception == null) {

                        if (ar.exception == null) {

                            mSms  = (List<SmsRawData>)

                            mSms = buildValidRawData((ArrayList<byte[]>) ar.result);

                                    buildValidRawData((ArrayList<byte[]>) ar.result);

                        } else {

                        } else {

                            if(DBG) log("Cannot load Sms records");

                            if(DBG) log("Cannot load Sms records");

                            if (mSms != null)

                            if (mSms != null)

telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -18,11 +18,8 @@ package com.android.internal.telephony.cdma; 




import android.os.Parcel;

import android.os.Parcel;

import android.os.SystemProperties;

import android.os.SystemProperties;

import android.text.format.Time;

import android.util.Config;

import android.util.Config;

import android.util.Log;

import android.util.Log;

import com.android.internal.telephony.EncodeException;

import com.android.internal.telephony.GsmAlphabet;

import com.android.internal.telephony.IccUtils;

import com.android.internal.telephony.IccUtils;

import com.android.internal.telephony.SmsHeader;

import com.android.internal.telephony.SmsHeader;

import com.android.internal.telephony.SmsMessageBase;

import com.android.internal.telephony.SmsMessageBase;
@@ -33,7 +30,6 @@ import com.android.internal.telephony.cdma.sms.SmsEnvelope; 
import com.android.internal.telephony.cdma.sms.UserData;

import com.android.internal.telephony.cdma.sms.UserData;

import com.android.internal.util.HexDump;

import com.android.internal.util.HexDump;





import java.io.BufferedInputStream;

import java.io.BufferedOutputStream;

import java.io.BufferedOutputStream;

import java.io.ByteArrayInputStream;

import java.io.ByteArrayInputStream;

import java.io.ByteArrayOutputStream;

import java.io.ByteArrayOutputStream;

telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -958,7 +958,7 @@ public final class BearerData { 
    private static String decode7bitGsm(byte[] data, int offset, int numFields)

    private static String decode7bitGsm(byte[] data, int offset, int numFields)

        throws CodingException

        throws CodingException

    {

    {

        // Start reading from the next 7-bit aligned boundry after offset.

        // Start reading from the next 7-bit aligned boundary after offset.

        int offsetBits = offset * 8;

        int offsetBits = offset * 8;

        int offsetSeptets = (offsetBits + 6) / 7;

        int offsetSeptets = (offsetBits + 6) / 7;

        numFields -= offsetSeptets;

        numFields -= offsetSeptets;

telephony/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java

+1 −1

File changed.

Contains only whitespace changes.