Merge "Revert "Delete more CDMA codes"" into main (1b3b599c) · Commits · e / os / android_frameworks_opt_telephony

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

+167 −0

Original line number	Diff line number	Diff line
		@@ -64,10 +64,17 @@ public abstract class BaseCommands implements CommandsInterface {
		protected RegistrantList mImsNetworkStateChangedRegistrants = new RegistrantList();
		@UnsupportedAppUsage
		protected RegistrantList mIccStatusChangedRegistrants = new RegistrantList();
		protected RegistrantList mIccSlotStatusChangedRegistrants = new RegistrantList();
		protected RegistrantList mVoicePrivacyOnRegistrants = new RegistrantList();
		protected RegistrantList mVoicePrivacyOffRegistrants = new RegistrantList();
		@UnsupportedAppUsage
		protected RegistrantList mOtaProvisionRegistrants = new RegistrantList();
		@UnsupportedAppUsage
		protected RegistrantList mCallWaitingInfoRegistrants = new RegistrantList();
		protected RegistrantList mDisplayInfoRegistrants = new RegistrantList();
		protected RegistrantList mSignalInfoRegistrants = new RegistrantList();
		protected RegistrantList mNumberInfoRegistrants = new RegistrantList();
		protected RegistrantList mRedirNumInfoRegistrants = new RegistrantList();
		protected RegistrantList mRingbackToneRegistrants = new RegistrantList();
		@UnsupportedAppUsage
		protected RegistrantList mResendIncallMuteRegistrants = new RegistrantList();
		@@ -277,6 +284,11 @@ public abstract class BaseCommands implements CommandsInterface {
		mCallStateRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForCallStateChanged(Handler h) {
		mCallStateRegistrants.remove(h);
		}

		@Override
		public void registerForNetworkStateChanged(Handler h, int what, Object obj) {
		mNetworkStateRegistrants.addUnique(h, what, obj);
		@@ -302,21 +314,51 @@ public abstract class BaseCommands implements CommandsInterface {
		mApnUnthrottledRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForApnUnthrottled(Handler h) {
		mApnUnthrottledRegistrants.remove(h);
		}

		@Override
		public void registerForSlicingConfigChanged(Handler h, int what, Object obj) {
		mSlicingConfigChangedRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForSlicingConfigChanged(Handler h) {
		mSlicingConfigChangedRegistrants.remove(h);
		}

		@Override
		public void registerForVoiceRadioTechChanged(Handler h, int what, Object obj) {
		mVoiceRadioTechChangedRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForVoiceRadioTechChanged(Handler h) {
		mVoiceRadioTechChangedRegistrants.remove(h);
		}

		@Override
		public void registerForIccStatusChanged(Handler h, int what, Object obj) {
		mIccStatusChangedRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForIccStatusChanged(Handler h) {
		mIccStatusChangedRegistrants.remove(h);
		}

		@Override
		public void registerForIccSlotStatusChanged(Handler h, int what, Object obj) {
		mIccSlotStatusChangedRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForIccSlotStatusChanged(Handler h) {
		mIccSlotStatusChangedRegistrants.remove(h);
		}

		@Override
		public void setOnNewGsmSms(Handler h, int what, Object obj) {
		mGsmSmsRegistrant = new Registrant (h, what, obj);
		@@ -413,11 +455,27 @@ public abstract class BaseCommands implements CommandsInterface {
		mUSSDRegistrant = new Registrant (h, what, obj);
		}

		@Override
		public void unSetOnUSSD(Handler h) {
		if (mUSSDRegistrant != null && mUSSDRegistrant.getHandler() == h) {
		mUSSDRegistrant.clear();
		mUSSDRegistrant = null;
		}
		}

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

		@Override
		public void unSetOnSuppServiceNotification(Handler h) {
		if (mSsnRegistrant != null && mSsnRegistrant.getHandler() == h) {
		mSsnRegistrant.clear();
		mSsnRegistrant = null;
		}
		}

		@Override
		public void setOnCatSessionEnd(Handler h, int what, Object obj) {
		mCatSessionEndRegistrant = new Registrant (h, what, obj);
		@@ -487,6 +545,11 @@ public abstract class BaseCommands implements CommandsInterface {
		public void registerForIccRefresh(Handler h, int what, Object obj) {
		mIccRefreshRegistrants.addUnique(h, what, obj);
		}
		@Override
		public void setOnIccRefresh(Handler h, int what, Object obj) {
		registerForIccRefresh(h, what, obj);
		}

		@Override
		public void setEmergencyCallbackMode(Handler h, int what, Object obj) {
		mEmergencyCallbackModeRegistrant = new Registrant (h, what, obj);
		@@ -496,16 +559,34 @@ public abstract class BaseCommands implements CommandsInterface {
		public void unregisterForIccRefresh(Handler h) {
		mIccRefreshRegistrants.remove(h);
		}
		@Override
		public void unsetOnIccRefresh(Handler h) {
		unregisterForIccRefresh(h);
		}

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

		@Override
		public void unSetOnCallRing(Handler h) {
		if (mRingRegistrant != null && mRingRegistrant.getHandler() == h) {
		mRingRegistrant.clear();
		mRingRegistrant = null;
		}
		}

		@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);
		@@ -521,6 +602,11 @@ public abstract class BaseCommands implements CommandsInterface {
		mRegistrationFailedRegistrant = new Registrant(h, what, obj);
		}

		@Override
		public void unSetOnRegistrationFailed(Handler h) {
		mRegistrationFailedRegistrant.clear();
		}

		@Override
		public void registerForInCallVoicePrivacyOn(Handler h, int what, Object obj) {
		mVoicePrivacyOnRegistrants.addUnique(h, what, obj);
		@@ -546,6 +632,14 @@ public abstract class BaseCommands implements CommandsInterface {
		mRestrictedStateRegistrant = new Registrant (h, what, obj);
		}

		@Override
		public void unSetOnRestrictedStateChanged(Handler h) {
		if (mRestrictedStateRegistrant != null && mRestrictedStateRegistrant.getHandler() == h) {
		mRestrictedStateRegistrant.clear();
		mRestrictedStateRegistrant = null;
		}
		}

		@Override
		public void registerForDisplayInfo(Handler h, int what, Object obj) {
		mDisplayInfoRegistrants.addUnique(h, what, obj);
		@@ -556,6 +650,16 @@ public abstract class BaseCommands implements CommandsInterface {
		mDisplayInfoRegistrants.remove(h);
		}

		@Override
		public void registerForCallWaitingInfo(Handler h, int what, Object obj) {
		mCallWaitingInfoRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForCallWaitingInfo(Handler h) {
		mCallWaitingInfoRegistrants.remove(h);
		}

		@Override
		public void registerForSignalInfo(Handler h, int what, Object obj) {
		mSignalInfoRegistrants.addUnique(h, what, obj);
		@@ -591,6 +695,11 @@ public abstract class BaseCommands implements CommandsInterface {
		mExitEmergencyCallbackModeRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForExitEmergencyCallbackMode(Handler h) {
		mExitEmergencyCallbackModeRegistrants.remove(h);
		}

		@Override
		public void registerForHardwareConfigChanged(Handler h, int what, Object obj) {
		mHardwareConfigChangeRegistrants.addUnique(h, what, obj);
		@@ -623,6 +732,19 @@ public abstract class BaseCommands implements CommandsInterface {
		}
		}

		@Override
		public void unregisterForRilConnected(Handler h) {
		mRilConnectedRegistrants.remove(h);
		}

		public void registerForSubscriptionStatusChanged(Handler h, int what, Object obj) {
		mSubscriptionStatusRegistrants.addUnique(h, what, obj);
		}

		public void unregisterForSubscriptionStatusChanged(Handler h) {
		mSubscriptionStatusRegistrants.remove(h);
		}

		@Override
		public void registerForEmergencyNumberList(Handler h, int what, Object obj) {
		mEmergencyNumberListRegistrants.addUnique(h, what, obj);
		@@ -636,6 +758,11 @@ public abstract class BaseCommands implements CommandsInterface {
		}
		}

		@Override
		public void unregisterForEmergencyNumberList(Handler h) {
		mEmergencyNumberListRegistrants.remove(h);
		}

		//***** Protected Methods
		/**
		* Store new RadioState and send notification based on the changes
		@@ -744,6 +871,11 @@ public abstract class BaseCommands implements CommandsInterface {
		mDisplayNetworkTypeChangedRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForSrvccStateChanged(Handler h) {
		mSrvccStateRegistrants.remove(h);
		}

		@Override
		public void testingEmergencyCall() {}

		@@ -820,6 +952,11 @@ public abstract class BaseCommands implements CommandsInterface {
		mCarrierInfoForImsiEncryptionRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForCarrierInfoForImsiEncryption(Handler h) {
		mCarrierInfoForImsiEncryptionRegistrants.remove(h);
		}

		@Override
		public void registerForNattKeepaliveStatus(Handler h, int what, Object obj) {
		synchronized (mStateMonitor) {
		@@ -846,6 +983,16 @@ public abstract class BaseCommands implements CommandsInterface {
		mUiccApplicationsEnablementRegistrants.addUnique(h, what, obj);
		}

		/**
		* Unregisters the handler for RIL_UNSOL_UICC_APPLICATIONS_ENABLEMENT_CHANGED events.
		*
		* @param h Handler for notification message.
		*/
		@Override
		public void unregisterUiccApplicationEnablementChanged(Handler h) {
		mUiccApplicationsEnablementRegistrants.remove(h);
		}

		/**
		* Registers the handler for RIL_UNSOL_BARRING_INFO_CHANGED events.
		*
		@@ -937,11 +1084,21 @@ public abstract class BaseCommands implements CommandsInterface {
		mNotifyAnbrRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForNotifyAnbr(Handler h) {
		mNotifyAnbrRegistrants.remove(h);
		}

		@Override
		public void registerForTriggerImsDeregistration(Handler h, int what, Object obj) {
		mTriggerImsDeregistrationRegistrants.add(h, what, obj);
		}

		@Override
		public void unregisterForTriggerImsDeregistration(Handler h) {
		mTriggerImsDeregistrationRegistrants.remove(h);
		}

		/**
		* Register to listen for the changes in the primary IMEI with respect to the sim slot.
		*/
		@@ -955,8 +1112,18 @@ public abstract class BaseCommands implements CommandsInterface {
		mCellularIdentifierDisclosedRegistrants.add(h, what, obj);
		}

		@Override
		public void unregisterForCellularIdentifierDisclosures(Handler h) {
		mCellularIdentifierDisclosedRegistrants.remove(h);
		}

		@Override
		public void registerForSecurityAlgorithmUpdates(Handler h, int what, Object obj) {
		mSecurityAlgorithmUpdatedRegistrants.add(h, what, obj);
		}

		@Override
		public void unregisterForSecurityAlgorithmUpdates(Handler h) {
		mSecurityAlgorithmUpdatedRegistrants.remove(h);
		}
		}