From bcd573229e5ec6d59bb7931a84a2baa86e0d200a Mon Sep 17 00:00:00 2001 From: Jake Hamby Date: Fri, 23 Apr 2010 19:34:41 -0700 Subject: [PATCH] Fix some more typos, remove unused imports, and remove unnecessary cast. More minor code cleanups in the telephony framework. Change-Id: I27abe11e02fc6fea12885eea4fe275240a546332 --- telephony/java/android/telephony/PhoneNumberUtils.java | 2 +- .../internal/telephony/cdma/RuimSmsInterfaceManager.java | 3 +-- .../java/com/android/internal/telephony/cdma/SmsMessage.java | 4 ---- .../com/android/internal/telephony/cdma/sms/BearerData.java | 2 +- .../com/android/internal/telephony/cdma/sms/SmsEnvelope.java | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 089a84b313dfd..666ad72e116c0 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -586,7 +586,7 @@ public class PhoneNumberUtils } } else { // 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). // In addition, "011 11 7005554141" must not equal to "+17005554141", // while "011 1 7005554141" must equal to "+17005554141" diff --git a/telephony/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java b/telephony/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java index cfcfd98b6840a..a9df375b58f81 100644 --- a/telephony/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java +++ b/telephony/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java @@ -67,8 +67,7 @@ public class RuimSmsInterfaceManager extends IccSmsInterfaceManager { ar = (AsyncResult)msg.obj; synchronized (mLock) { if (ar.exception == null) { - mSms = (List) - buildValidRawData((ArrayList) ar.result); + mSms = buildValidRawData((ArrayList) ar.result); } else { if(DBG) log("Cannot load Sms records"); if (mSms != null) diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java index 5429f35a4cafb..565eb6d036c41 100755 --- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java @@ -18,11 +18,8 @@ package com.android.internal.telephony.cdma; import android.os.Parcel; import android.os.SystemProperties; -import android.text.format.Time; import android.util.Config; 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.SmsHeader; 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.util.HexDump; -import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java index a097878cf821c..6d9a7d09f9874 100644 --- a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java @@ -958,7 +958,7 @@ public final class BearerData { private static String decode7bitGsm(byte[] data, int offset, int numFields) 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 offsetSeptets = (offsetBits + 6) / 7; numFields -= offsetSeptets; diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java b/telephony/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java index 0dcacc104070e..a67327ae0f686 100644 --- a/telephony/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java @@ -17,7 +17,7 @@ package com.android.internal.telephony.cdma.sms; -public final class SmsEnvelope{ +public final class SmsEnvelope { /** * Message Types * (See 3GPP2 C.S0015-B 3.4.1)