diff options
Diffstat (limited to 'src/java/com/android/internal/telephony/cat')
6 files changed, 34 insertions, 20 deletions
diff --git a/src/java/com/android/internal/telephony/cat/AppInterface.java b/src/java/com/android/internal/telephony/cat/AppInterface.java index ed7c822210..4f6ca8624d 100755 --- a/src/java/com/android/internal/telephony/cat/AppInterface.java +++ b/src/java/com/android/internal/telephony/cat/AppInterface.java @@ -62,13 +62,20 @@ public interface AppInterface { */ void onCmdResponse(CatResponseMessage resMsg); + /** + * Dispose when the service is not longer needed. + */ + void dispose(); + /* * Enumeration for representing "Type of Command" of proactive commands. * Those are the only commands which are supported by the Telephony. Any app * implementation should support those. * Refer to ETSI TS 102.223 section 9.4 */ - public static enum CommandType { + @UnsupportedAppUsage(implicitMember = + "values()[Lcom/android/internal/telephony/cat/AppInterface$CommandType;") + enum CommandType { @UnsupportedAppUsage DISPLAY_TEXT(0x21), @UnsupportedAppUsage diff --git a/src/java/com/android/internal/telephony/cat/CatService.java b/src/java/com/android/internal/telephony/cat/CatService.java index 71718081b7..f149c6faa9 100644 --- a/src/java/com/android/internal/telephony/cat/CatService.java +++ b/src/java/com/android/internal/telephony/cat/CatService.java @@ -16,12 +16,9 @@ package com.android.internal.telephony.cat; -import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants - .IDLE_SCREEN_AVAILABLE_EVENT; -import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants - .LANGUAGE_SELECTION_EVENT; -import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants - .USER_ACTIVITY_EVENT; +import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants.IDLE_SCREEN_AVAILABLE_EVENT; +import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants.LANGUAGE_SELECTION_EVENT; +import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants.USER_ACTIVITY_EVENT; import android.annotation.UnsupportedAppUsage; import android.app.ActivityManagerNative; @@ -38,7 +35,6 @@ import android.os.Handler; import android.os.LocaleList; import android.os.Message; import android.os.RemoteException; -import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import com.android.internal.telephony.CommandsInterface; @@ -221,7 +217,7 @@ public class CatService extends Handler implements AppInterface { synchronized (sInstanceLock) { if (sInstance == null) { - int simCount = TelephonyManager.getDefault().getMaxPhoneCount(); + int simCount = TelephonyManager.getDefault().getSupportedModemCount(); sInstance = new CatService[simCount]; for (int i = 0; i < simCount; i++) { sInstance[i] = null; @@ -252,6 +248,7 @@ public class CatService extends Handler implements AppInterface { } @UnsupportedAppUsage + @Override public void dispose() { synchronized (sInstanceLock) { CatLog.d(this, "Disposing CatService object"); @@ -275,7 +272,7 @@ public class CatService extends Handler implements AppInterface { mMsgDecoder = null; removeCallbacksAndMessages(null); if (sInstance != null) { - if (SubscriptionManager.isValidSlotIndex(mSlotId)) { + if (mSlotId >= 0 && mSlotId < sInstance.length) { sInstance[mSlotId] = null; } else { CatLog.d(this, "error: invaild slot id: " + mSlotId); diff --git a/src/java/com/android/internal/telephony/cat/ResponseData.java b/src/java/com/android/internal/telephony/cat/ResponseData.java index 600514ff20..4d0a2d2d12 100644 --- a/src/java/com/android/internal/telephony/cat/ResponseData.java +++ b/src/java/com/android/internal/telephony/cat/ResponseData.java @@ -16,20 +16,25 @@ package com.android.internal.telephony.cat; -import com.android.internal.telephony.EncodeException; -import com.android.internal.telephony.GsmAlphabet; -import java.util.Calendar; -import java.util.TimeZone; +import android.annotation.UnsupportedAppUsage; import android.os.SystemProperties; import android.text.TextUtils; +import com.android.internal.telephony.EncodeException; +import com.android.internal.telephony.GsmAlphabet; import com.android.internal.telephony.cat.AppInterface.CommandType; -import android.annotation.UnsupportedAppUsage; import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; +import java.util.Calendar; +import java.util.TimeZone; abstract class ResponseData { + + @UnsupportedAppUsage + ResponseData() { + } + /** * Format the data appropriate for TERMINAL RESPONSE and write it into * the ByteArrayOutputStream object. diff --git a/src/java/com/android/internal/telephony/cat/ResultCode.java b/src/java/com/android/internal/telephony/cat/ResultCode.java index 346d74adba..adcf53e094 100644 --- a/src/java/com/android/internal/telephony/cat/ResultCode.java +++ b/src/java/com/android/internal/telephony/cat/ResultCode.java @@ -26,6 +26,7 @@ import android.annotation.UnsupportedAppUsage; * * {@hide} */ +@UnsupportedAppUsage(implicitMember = "values()[Lcom/android/internal/telephony/cat/ResultCode;") public enum ResultCode { /* diff --git a/src/java/com/android/internal/telephony/cat/RilMessageDecoder.java b/src/java/com/android/internal/telephony/cat/RilMessageDecoder.java index ebaf08a859..eeb9dd42fb 100755 --- a/src/java/com/android/internal/telephony/cat/RilMessageDecoder.java +++ b/src/java/com/android/internal/telephony/cat/RilMessageDecoder.java @@ -22,7 +22,6 @@ import android.os.Message; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.uicc.IccFileHandler; import com.android.internal.telephony.uicc.IccUtils; import com.android.internal.util.State; @@ -41,6 +40,7 @@ class RilMessageDecoder extends StateMachine { // members @UnsupportedAppUsage private CommandParamsFactory mCmdParamsFactory = null; + @UnsupportedAppUsage private RilMessage mCurrentRilMessage = null; private Handler mCaller = null; private static int mSimCount = 0; @@ -63,7 +63,7 @@ class RilMessageDecoder extends StateMachine { public static synchronized RilMessageDecoder getInstance(Handler caller, IccFileHandler fh, int slotId) { if (null == mInstance) { - mSimCount = TelephonyManager.getDefault().getMaxPhoneCount(); + mSimCount = TelephonyManager.getDefault().getSupportedModemCount(); mInstance = new RilMessageDecoder[mSimCount]; for (int i = 0; i < mSimCount; i++) { mInstance[i] = null; @@ -88,6 +88,7 @@ class RilMessageDecoder extends StateMachine { * * @param rilMsg */ + @UnsupportedAppUsage public void sendStartDecodingMessageParams(RilMessage rilMsg) { Message msg = obtainMessage(CMD_START); msg.obj = rilMsg; @@ -107,6 +108,7 @@ class RilMessageDecoder extends StateMachine { sendMessage(msg); } + @UnsupportedAppUsage private void sendCmdForExecution(RilMessage rilMsg) { Message msg = mCaller.obtainMessage(CatService.MSG_ID_RIL_MSG_DECODED, new RilMessage(rilMsg)); diff --git a/src/java/com/android/internal/telephony/cat/ValueParser.java b/src/java/com/android/internal/telephony/cat/ValueParser.java index 4e528b6f66..03d7f67482 100644 --- a/src/java/com/android/internal/telephony/cat/ValueParser.java +++ b/src/java/com/android/internal/telephony/cat/ValueParser.java @@ -16,13 +16,14 @@ package com.android.internal.telephony.cat; +import android.annotation.UnsupportedAppUsage; +import android.content.res.Resources; +import android.content.res.Resources.NotFoundException; + import com.android.internal.telephony.GsmAlphabet; import com.android.internal.telephony.cat.Duration.TimeUnit; import com.android.internal.telephony.uicc.IccUtils; -import android.annotation.UnsupportedAppUsage; -import android.content.res.Resources; -import android.content.res.Resources.NotFoundException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; @@ -62,6 +63,7 @@ abstract class ValueParser { * Command Details object is found, ResultException is thrown. * @throws ResultException */ + @UnsupportedAppUsage static DeviceIdentities retrieveDeviceIdentities(ComprehensionTlv ctlv) throws ResultException { |