Merge "Make sure registrants don't register twice on RIL/BaseCommands" (59fb7934) · Commits · e / os / android_frameworks_opt_telephony

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

+47 −94

Original line number	Original line	Diff line number	Diff line
	@@ -167,11 +167,9 @@ public abstract class BaseCommands implements CommandsInterface {

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

	synchronized (mStateMonitor) {		synchronized (mStateMonitor) {
	mRadioStateChangedRegistrants.add(r);		mRadioStateChangedRegistrants.addUnique(h, what, obj);
	r.notifyRegistrant();		Message.obtain(h, what, new AsyncResult(obj, null, null)).sendToTarget();
	}		}
	}		}

	@@ -183,8 +181,7 @@ public abstract class BaseCommands implements CommandsInterface {
	}		}

	public void registerForImsNetworkStateChanged(Handler h, int what, Object obj) {		public void registerForImsNetworkStateChanged(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mImsNetworkStateChangedRegistrants.addUnique(h, what, obj);
	mImsNetworkStateChangedRegistrants.add(r);
	}		}

	public void unregisterForImsNetworkStateChanged(Handler h) {		public void unregisterForImsNetworkStateChanged(Handler h) {
	@@ -193,13 +190,11 @@ public abstract class BaseCommands implements CommandsInterface {

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

	synchronized (mStateMonitor) {		synchronized (mStateMonitor) {
	mOnRegistrants.add(r);		mOnRegistrants.addUnique(h, what, obj);

	if (mState == TelephonyManager.RADIO_POWER_ON) {		if (mState == TelephonyManager.RADIO_POWER_ON) {
	r.notifyRegistrant(new AsyncResult(null, null, null));		Message.obtain(h, what, new AsyncResult(obj, null, null)).sendToTarget();
	}		}
	}		}
	}		}
	@@ -213,13 +208,11 @@ public abstract class BaseCommands implements CommandsInterface {

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

	synchronized (mStateMonitor) {		synchronized (mStateMonitor) {
	mAvailRegistrants.add(r);		mAvailRegistrants.addUnique(h, what, obj);

	if (mState != TelephonyManager.RADIO_POWER_UNAVAILABLE) {		if (mState != TelephonyManager.RADIO_POWER_UNAVAILABLE) {
	r.notifyRegistrant(new AsyncResult(null, null, null));		Message.obtain(h, what, new AsyncResult(obj, null, null)).sendToTarget();
	}		}
	}		}
	}		}
	@@ -233,13 +226,11 @@ public abstract class BaseCommands implements CommandsInterface {

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

	synchronized (mStateMonitor) {		synchronized (mStateMonitor) {
	mNotAvailRegistrants.add(r);		mNotAvailRegistrants.addUnique(h, what, obj);

	if (mState == TelephonyManager.RADIO_POWER_UNAVAILABLE) {		if (mState == TelephonyManager.RADIO_POWER_UNAVAILABLE) {
	r.notifyRegistrant(new AsyncResult(null, null, null));		Message.obtain(h, what, new AsyncResult(obj, null, null)).sendToTarget();
	}		}
	}		}
	}		}
	@@ -253,14 +244,12 @@ public abstract class BaseCommands implements CommandsInterface {

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

	synchronized (mStateMonitor) {		synchronized (mStateMonitor) {
	mOffOrNotAvailRegistrants.add(r);		mOffOrNotAvailRegistrants.addUnique(h, what, obj);

	if (mState == TelephonyManager.RADIO_POWER_OFF		if (mState == TelephonyManager.RADIO_POWER_OFF
	\|\| mState == TelephonyManager.RADIO_POWER_UNAVAILABLE) {		\|\| mState == TelephonyManager.RADIO_POWER_UNAVAILABLE) {
	r.notifyRegistrant(new AsyncResult(null, null, null));		Message.obtain(h, what, new AsyncResult(obj, null, null)).sendToTarget();
	}		}
	}		}
	}		}
	@@ -273,9 +262,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForCallStateChanged(Handler h, int what, Object obj) {		public void registerForCallStateChanged(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mCallStateRegistrants.addUnique(h, what, obj);

	mCallStateRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -285,9 +272,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForNetworkStateChanged(Handler h, int what, Object obj) {		public void registerForNetworkStateChanged(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mNetworkStateRegistrants.addUnique(h, what, obj);

	mNetworkStateRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -297,9 +282,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForDataCallListChanged(Handler h, int what, Object obj) {		public void registerForDataCallListChanged(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mDataCallListChangedRegistrants.addUnique(h, what, obj);

	mDataCallListChangedRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -309,8 +292,7 @@ public abstract class BaseCommands implements CommandsInterface {

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

	@Override		@Override
	@@ -320,8 +302,7 @@ public abstract class BaseCommands implements CommandsInterface {

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

	@Override		@Override
	@@ -331,8 +312,7 @@ public abstract class BaseCommands implements CommandsInterface {

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

	@Override		@Override
	@@ -524,8 +504,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForIccRefresh(Handler h, int what, Object obj) {		public void registerForIccRefresh(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mIccRefreshRegistrants.addUnique(h, what, obj);
	mIccRefreshRegistrants.add(r);
	}		}
	@Override		@Override
	public void setOnIccRefresh(Handler h, int what, Object obj) {		public void setOnIccRefresh(Handler h, int what, Object obj) {
	@@ -581,8 +560,7 @@ public abstract class BaseCommands implements CommandsInterface {

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

	@Override		@Override
	@@ -592,8 +570,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForInCallVoicePrivacyOff(Handler h, int what, Object obj) {		public void registerForInCallVoicePrivacyOff(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mVoicePrivacyOffRegistrants.addUnique(h, what, obj);
	mVoicePrivacyOffRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -616,8 +593,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForDisplayInfo(Handler h, int what, Object obj) {		public void registerForDisplayInfo(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mDisplayInfoRegistrants.addUnique(h, what, obj);
	mDisplayInfoRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -627,8 +603,7 @@ public abstract class BaseCommands implements CommandsInterface {

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

	@Override		@Override
	@@ -638,8 +613,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForSignalInfo(Handler h, int what, Object obj) {		public void registerForSignalInfo(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mSignalInfoRegistrants.addUnique(h, what, obj);
	mSignalInfoRegistrants.add(r);
	}		}

	public void setOnUnsolOemHookRaw(Handler h, int what, Object obj) {		public void setOnUnsolOemHookRaw(Handler h, int what, Object obj) {
	@@ -660,8 +634,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForCdmaOtaProvision(Handler h,int what, Object obj){		public void registerForCdmaOtaProvision(Handler h,int what, Object obj){
	Registrant r = new Registrant (h, what, obj);		mOtaProvisionRegistrants.addUnique(h, what, obj);
	mOtaProvisionRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -671,8 +644,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForNumberInfo(Handler h,int what, Object obj) {		public void registerForNumberInfo(Handler h,int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mNumberInfoRegistrants.addUnique(h, what, obj);
	mNumberInfoRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -682,8 +654,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForRedirectedNumberInfo(Handler h,int what, Object obj) {		public void registerForRedirectedNumberInfo(Handler h,int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mRedirNumInfoRegistrants.addUnique(h, what, obj);
	mRedirNumInfoRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -693,8 +664,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForLineControlInfo(Handler h, int what, Object obj) {		public void registerForLineControlInfo(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mLineControlInfoRegistrants.addUnique(h, what, obj);
	mLineControlInfoRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -704,8 +674,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerFoT53ClirlInfo(Handler h,int what, Object obj) {		public void registerFoT53ClirlInfo(Handler h,int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mT53ClirInfoRegistrants.addUnique(h, what, obj);
	mT53ClirInfoRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -715,8 +684,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForT53AudioControlInfo(Handler h,int what, Object obj) {		public void registerForT53AudioControlInfo(Handler h,int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mT53AudCntrlInfoRegistrants.addUnique(h, what, obj);
	mT53AudCntrlInfoRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -726,8 +694,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForRingbackTone(Handler h, int what, Object obj) {		public void registerForRingbackTone(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mRingbackToneRegistrants.addUnique(h, what, obj);
	mRingbackToneRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -737,8 +704,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForResendIncallMute(Handler h, int what, Object obj) {		public void registerForResendIncallMute(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mResendIncallMuteRegistrants.addUnique(h, what, obj);
	mResendIncallMuteRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -748,8 +714,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForCdmaSubscriptionChanged(Handler h, int what, Object obj) {		public void registerForCdmaSubscriptionChanged(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mCdmaSubscriptionChangedRegistrants.addUnique(h, what, obj);
	mCdmaSubscriptionChangedRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -759,8 +724,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForCdmaPrlChanged(Handler h, int what, Object obj) {		public void registerForCdmaPrlChanged(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mCdmaPrlChangedRegistrants.addUnique(h, what, obj);
	mCdmaPrlChangedRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -770,8 +734,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForExitEmergencyCallbackMode(Handler h, int what, Object obj) {		public void registerForExitEmergencyCallbackMode(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mExitEmergencyCallbackModeRegistrants.addUnique(h, what, obj);
	mExitEmergencyCallbackModeRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -781,8 +744,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForHardwareConfigChanged(Handler h, int what, Object obj) {		public void registerForHardwareConfigChanged(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mHardwareConfigChangeRegistrants.addUnique(h, what, obj);
	mHardwareConfigChangeRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -793,7 +755,7 @@ public abstract class BaseCommands implements CommandsInterface {
	@Override		@Override
	public void registerForNetworkScanResult(Handler h, int what, Object obj) {		public void registerForNetworkScanResult(Handler h, int what, Object obj) {
	Registrant r = new Registrant(h, what, obj);		Registrant r = new Registrant(h, what, obj);
	mRilNetworkScanResultRegistrants.add(r);		mRilNetworkScanResultRegistrants.addUnique(h, what, obj);
	}		}

	@Override		@Override
	@@ -806,10 +768,10 @@ public abstract class BaseCommands implements CommandsInterface {
	*/		*/
	@Override		@Override
	public void registerForRilConnected(Handler h, int what, Object obj) {		public void registerForRilConnected(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mRilConnectedRegistrants.addUnique(h, what, obj);
	mRilConnectedRegistrants.add(r);
	if (mRilVersion != -1) {		if (mRilVersion != -1) {
	r.notifyRegistrant(new AsyncResult(null, new Integer(mRilVersion), null));		Message.obtain(h, what, new AsyncResult(obj, new Integer(mRilVersion), null))
			.sendToTarget();
	}		}
	}		}

	@@ -819,8 +781,7 @@ public abstract class BaseCommands implements CommandsInterface {
	}		}

	public void registerForSubscriptionStatusChanged(Handler h, int what, Object obj) {		public void registerForSubscriptionStatusChanged(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mSubscriptionStatusRegistrants.addUnique(h, what, obj);
	mSubscriptionStatusRegistrants.add(r);
	}		}

	public void unregisterForSubscriptionStatusChanged(Handler h) {		public void unregisterForSubscriptionStatusChanged(Handler h) {
	@@ -829,8 +790,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForEmergencyNumberList(Handler h, int what, Object obj) {		public void registerForEmergencyNumberList(Handler h, int what, Object obj) {
	Registrant r = new Registrant(h, what, obj);		mEmergencyNumberListRegistrants.addUnique(h, what, obj);
	mEmergencyNumberListRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -901,8 +861,7 @@ public abstract class BaseCommands implements CommandsInterface {
	*/		*/
	@Override		@Override
	public void registerForCellInfoList(Handler h, int what, Object obj) {		public void registerForCellInfoList(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mRilCellInfoListRegistrants.addUnique(h, what, obj);
	mRilCellInfoListRegistrants.add(r);
	}		}
	@Override		@Override
	public void unregisterForCellInfoList(Handler h) {		public void unregisterForCellInfoList(Handler h) {
	@@ -911,8 +870,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForPhysicalChannelConfiguration(Handler h, int what, Object obj) {		public void registerForPhysicalChannelConfiguration(Handler h, int what, Object obj) {
	Registrant r = new Registrant(h, what, obj);		mPhysicalChannelConfigurationRegistrants.addUnique(h, what, obj);
	mPhysicalChannelConfigurationRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -922,9 +880,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForSrvccStateChanged(Handler h, int what, Object obj) {		public void registerForSrvccStateChanged(Handler h, int what, Object obj) {
	Registrant r = new Registrant (h, what, obj);		mSrvccStateRegistrants.addUnique(h, what, obj);

	mSrvccStateRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -961,8 +917,7 @@ public abstract class BaseCommands implements CommandsInterface {

	@Override		@Override
	public void registerForRadioCapabilityChanged(Handler h, int what, Object obj) {		public void registerForRadioCapabilityChanged(Handler h, int what, Object obj) {
	Registrant r = new Registrant(h, what, obj);		mPhoneRadioCapabilityChangedRegistrants.addUnique(h, what, obj);
	mPhoneRadioCapabilityChangedRegistrants.add(r);
	}		}

	@Override		@Override
	@@ -984,10 +939,8 @@ public abstract class BaseCommands implements CommandsInterface {

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

	synchronized (mStateMonitor) {		synchronized (mStateMonitor) {
	mLceInfoRegistrants.add(r);		mLceInfoRegistrants.addUnique(h, what, obj);
	}		}
	}		}

	@@ -1033,7 +986,7 @@ public abstract class BaseCommands implements CommandsInterface {
	Registrant r = new Registrant(h, what, obj);		Registrant r = new Registrant(h, what, obj);

	synchronized (mStateMonitor) {		synchronized (mStateMonitor) {
	mNattKeepaliveStatusRegistrants.add(r);		mNattKeepaliveStatusRegistrants.addUnique(h, what, obj);
	}		}
	}		}