STK CC feature implementation (faa3aff6) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/BaseCommands.java

+25 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		* Not a Contribution.
		*
		* Copyright (C) 2006 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		@@ -84,6 +87,8 @@ public abstract class BaseCommands implements CommandsInterface {
		protected Registrant mRingRegistrant;
		protected Registrant mRestrictedStateRegistrant;
		protected Registrant mGsmBroadcastSmsRegistrant;
		protected Registrant mCatCcAlphaRegistrant;
		protected Registrant mSsRegistrant;

		// Preferred network type received from PhoneFactory.
		// This is used when establishing a connection to the
		@@ -444,6 +449,26 @@ public abstract class BaseCommands implements CommandsInterface {
		mRingRegistrant.clear();
		}

		@Override
		public void setOnSs(Handler h, int what, Object obj) {
		mSsRegistrant = new Registrant (h, what, obj);
		}

		@Override
		public void unSetOnSs(Handler h) {
		mSsRegistrant.clear();
		}

		@Override
		public void setOnCatCcAlphaNotify(Handler h, int what, Object obj) {
		mCatCcAlphaRegistrant = new Registrant (h, what, obj);
		}

		@Override
		public void unSetOnCatCcAlphaNotify(Handler h) {
		mCatCcAlphaRegistrant.clear();
		}

		@Override
		public void registerForInCallVoicePrivacyOn(Handler h, int what, Object obj) {
		Registrant r = new Registrant (h, what, obj);

src/java/com/android/internal/telephony/CommandException.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,15 @@ public class CommandException extends RuntimeException {
		MODE_NOT_SUPPORTED,
		FDN_CHECK_FAILURE,
		ILLEGAL_SIM_OR_ME,
		DIAL_MODIFIED_TO_USSD,
		DIAL_MODIFIED_TO_SS,
		DIAL_MODIFIED_TO_DIAL,
		USSD_MODIFIED_TO_DIAL,
		USSD_MODIFIED_TO_SS,
		USSD_MODIFIED_TO_USSD,
		SS_MODIFIED_TO_DIAL,
		SS_MODIFIED_TO_USSD,
		SS_MODIFIED_TO_SS,
		}

		public CommandException(Error e) {
		@@ -83,6 +92,24 @@ public class CommandException extends RuntimeException {
		return new CommandException(Error.FDN_CHECK_FAILURE);
		case RILConstants.ILLEGAL_SIM_OR_ME:
		return new CommandException(Error.ILLEGAL_SIM_OR_ME);
		case RILConstants.DIAL_MODIFIED_TO_USSD:
		return new CommandException(Error.DIAL_MODIFIED_TO_USSD);
		case RILConstants.DIAL_MODIFIED_TO_SS:
		return new CommandException(Error.DIAL_MODIFIED_TO_SS);
		case RILConstants.DIAL_MODIFIED_TO_DIAL:
		return new CommandException(Error.DIAL_MODIFIED_TO_DIAL);
		case RILConstants.USSD_MODIFIED_TO_DIAL:
		return new CommandException(Error.USSD_MODIFIED_TO_DIAL);
		case RILConstants.USSD_MODIFIED_TO_SS:
		return new CommandException(Error.USSD_MODIFIED_TO_SS);
		case RILConstants.USSD_MODIFIED_TO_USSD:
		return new CommandException(Error.USSD_MODIFIED_TO_USSD);
		case RILConstants.SS_MODIFIED_TO_DIAL:
		return new CommandException(Error.SS_MODIFIED_TO_DIAL);
		case RILConstants.SS_MODIFIED_TO_USSD:
		return new CommandException(Error.SS_MODIFIED_TO_USSD);
		case RILConstants.SS_MODIFIED_TO_SS:
		return new CommandException(Error.SS_MODIFIED_TO_SS);
		default:
		Rlog.e("GSM", "Unrecognized RIL errno " + ril_errno);
		return new CommandException(Error.INVALID_RESPONSE);

src/java/com/android/internal/telephony/CommandsInterface.java

+26 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		* Not a Contribution.
		*
		* Copyright (C) 2006 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		@@ -395,6 +398,29 @@ public interface CommandsInterface {
		void setSuppServiceNotifications(boolean enable, Message result);
		//void unSetSuppServiceNotifications(Handler h);

		/**
		* Sets the handler for Alpha Notification during STK Call Control.
		* Unlike the register* methods, there's only one notification handler
		*
		* @param h Handler for notification message.
		* @param what User-defined message code.
		* @param obj User object.
		*/
		void setOnCatCcAlphaNotify(Handler h, int what, Object obj);
		void unSetOnCatCcAlphaNotify(Handler h);

		/**
		* Sets the handler for notifying Suplementary Services (SS)
		* Data during STK Call Control.
		* Unlike the register* methods, there's only one notification handler
		*
		* @param h Handler for notification message.
		* @param what User-defined message code.
		* @param obj User object.
		*/
		void setOnSs(Handler h, int what, Object obj);
		void unSetOnSs(Handler h);

		/**
		* Sets the handler for Event Notifications for CDMA Display Info.
		* Unlike the register* methods, there's only one notification handler

src/java/com/android/internal/telephony/Connection.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,9 @@ public abstract class Connection {
		CS_RESTRICTED_NORMAL, /* call was blocked by restricted normal voice access */
		CS_RESTRICTED_EMERGENCY, /* call was blocked by restricted emergency voice access */
		UNOBTAINABLE_NUMBER, /* Unassigned number (3GPP TS 24.008 table 10.5.123) */
		DIAL_MODIFIED_TO_USSD, /* Stk Call Control modified DIAL request to USSD request */
		DIAL_MODIFIED_TO_SS, /* Stk Call Control modified DIAL request to SS request */
		DIAL_MODIFIED_TO_DIAL, /* Stk Call Control modified DIAL request to DIAL with modified data */
		CDMA_LOCKED_UNTIL_POWER_CYCLE, /* MS is locked until next power cycle */
		CDMA_DROP,
		CDMA_INTERCEPT, /* INTERCEPT order received, MS state idle entered */

src/java/com/android/internal/telephony/PhoneBase.java

+4 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		* Not a Contribution.
		*
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		@@ -117,6 +120,7 @@ public abstract class PhoneBase extends Handler implements Phone {
		protected static final int EVENT_SET_NETWORK_AUTOMATIC = 28;
		protected static final int EVENT_ICC_RECORD_EVENTS = 29;
		protected static final int EVENT_ICC_CHANGED = 30;
		protected static final int EVENT_SS = 31;

		// Key used to read/write current CLIR setting
		public static final String CLIR_KEY = "clir_key";