Merge "Added Locking for MmTelFeature" am: d273dea10b am: 3a92430622 (500e9fe0) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ims/feature/MmTelFeature.java

+14 −4

Original line number	Original line	Diff line number	Diff line
	@@ -139,35 +139,45 @@ public class MmTelFeature extends ImsFeature {

	@Override		@Override
	public int queryCapabilityStatus() throws RemoteException {		public int queryCapabilityStatus() throws RemoteException {
			synchronized (mLock) {
	return MmTelFeature.this.queryCapabilityStatus().mCapabilities;		return MmTelFeature.this.queryCapabilityStatus().mCapabilities;
	}		}
			}

	@Override		@Override
	public void addCapabilityCallback(IImsCapabilityCallback c) {		public void addCapabilityCallback(IImsCapabilityCallback c) {
			// no need to lock, structure already handles multithreading.
	MmTelFeature.this.addCapabilityCallback(c);		MmTelFeature.this.addCapabilityCallback(c);
	}		}

	@Override		@Override
	public void removeCapabilityCallback(IImsCapabilityCallback c) {		public void removeCapabilityCallback(IImsCapabilityCallback c) {
			// no need to lock, structure already handles multithreading.
	MmTelFeature.this.removeCapabilityCallback(c);		MmTelFeature.this.removeCapabilityCallback(c);
	}		}

	@Override		@Override
	public void changeCapabilitiesConfiguration(CapabilityChangeRequest request,		public void changeCapabilitiesConfiguration(CapabilityChangeRequest request,
	IImsCapabilityCallback c) throws RemoteException {		IImsCapabilityCallback c) throws RemoteException {
			synchronized (mLock) {
	MmTelFeature.this.requestChangeEnabledCapabilities(request, c);		MmTelFeature.this.requestChangeEnabledCapabilities(request, c);
	}		}
			}

	@Override		@Override
	public void queryCapabilityConfiguration(int capability, int radioTech,		public void queryCapabilityConfiguration(int capability, int radioTech,
	IImsCapabilityCallback c) {		IImsCapabilityCallback c) {
			synchronized (mLock) {
	queryCapabilityConfigurationInternal(capability, radioTech, c);		queryCapabilityConfigurationInternal(capability, radioTech, c);
	}		}
			}

	@Override		@Override
	public void setSmsListener(IImsSmsListener l) throws RemoteException {		public void setSmsListener(IImsSmsListener l) throws RemoteException {
			synchronized (mLock) {
	MmTelFeature.this.setSmsListener(l);		MmTelFeature.this.setSmsListener(l);
	}		}
			}

	@Override		@Override
	public void sendSms(int token, int messageRef, String format, String smsc, boolean retry,		public void sendSms(int token, int messageRef, String format, String smsc, boolean retry,