drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Possible Deadlock with getFeatureState"

Browse Source
This commit is contained in:
Brad Ebinger
2018-06-25 17:30:02 +00:00
committed by Gerrit Code Review
parent 3580a6a996 8f074959e5
commit 6bebb8418c
2 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/ims/feature/ImsFeature.java
View File

@ -341,15 +341,15 @@ public abstract class ImsFeature {
}
}
/** @hide */
protected Context mContext;
/** @hide */
protected final Object mLock = new Object();
private final Set<IImsFeatureStatusCallback> mStatusCallbacks = Collections.newSetFromMap(
new WeakHashMap<IImsFeatureStatusCallback, Boolean>());
private @ImsState int mState = STATE_UNAVAILABLE;
private int mSlotId = SubscriptionManager.INVALID_SIM_SLOT_INDEX;
/**
* @hide
*/
protected Context mContext;
private final Object mLock = new Object();
private final RemoteCallbackList<IImsCapabilityCallback> mCapabilityCallbacks
= new RemoteCallbackList<>();
private Capabilities mCapabilityStatus = new Capabilities();

51
telephony/java/android/telephony/ims/feature/MmTelFeature.java
View File

@ -22,25 +22,25 @@ import android.os.Bundle;
import android.os.Message;
import android.os.RemoteException;
import android.telecom.TelecomManager;
import android.telephony.ims.stub.ImsRegistrationImplBase;
import android.telephony.ims.stub.ImsCallSessionImplBase;
import android.telephony.ims.stub.ImsSmsImplBase;
import android.telephony.ims.ImsCallProfile;
import android.telephony.ims.ImsCallSession;
import android.telephony.ims.ImsReasonInfo;
import android.telephony.ims.aidl.IImsCapabilityCallback;
import android.telephony.ims.aidl.IImsMmTelFeature;
import android.telephony.ims.aidl.IImsMmTelListener;
import android.telephony.ims.aidl.IImsSmsListener;
import android.telephony.ims.stub.ImsCallSessionImplBase;
import android.telephony.ims.stub.ImsEcbmImplBase;
import android.telephony.ims.stub.ImsMultiEndpointImplBase;
import android.telephony.ims.stub.ImsRegistrationImplBase;
import android.telephony.ims.stub.ImsSmsImplBase;
import android.telephony.ims.stub.ImsUtImplBase;
import android.util.Log;
import android.telephony.ims.ImsCallProfile;
import android.telephony.ims.ImsReasonInfo;
import com.android.ims.internal.IImsCallSession;
import com.android.ims.internal.IImsEcbm;
import com.android.ims.internal.IImsMultiEndpoint;
import com.android.ims.internal.IImsUt;
import android.telephony.ims.ImsCallSession;
import com.android.internal.annotations.VisibleForTesting;
import java.lang.annotation.Retention;
@ -61,20 +61,16 @@ public class MmTelFeature extends ImsFeature {
private final IImsMmTelFeature mImsMMTelBinder = new IImsMmTelFeature.Stub() {
@Override
public void setListener(IImsMmTelListener l) throws RemoteException {
synchronized (mLock) {
MmTelFeature.this.setListener(l);
}
public void setListener(IImsMmTelListener l) {
MmTelFeature.this.setListener(l);
}
@Override
public int getFeatureState() throws RemoteException {
synchronized (mLock) {
try {
return MmTelFeature.this.getFeatureState();
} catch (Exception e) {
throw new RemoteException(e.getMessage());
}
try {
return MmTelFeature.this.getFeatureState();
} catch (Exception e) {
throw new RemoteException(e.getMessage());
}
}
@ -138,10 +134,8 @@ public class MmTelFeature extends ImsFeature {
}
@Override
public int queryCapabilityStatus() throws RemoteException {
synchronized (mLock) {
return MmTelFeature.this.queryCapabilityStatus().mCapabilities;
}
public int queryCapabilityStatus() {
return MmTelFeature.this.queryCapabilityStatus().mCapabilities;
}
@Override
@ -158,7 +152,7 @@ public class MmTelFeature extends ImsFeature {
@Override
public void changeCapabilitiesConfiguration(CapabilityChangeRequest request,
IImsCapabilityCallback c) throws RemoteException {
IImsCapabilityCallback c) {
synchronized (mLock) {
MmTelFeature.this.requestChangeEnabledCapabilities(request, c);
}
@ -173,10 +167,8 @@ public class MmTelFeature extends ImsFeature {
}
@Override
public void setSmsListener(IImsSmsListener l) throws RemoteException {
synchronized (mLock) {
MmTelFeature.this.setSmsListener(l);
}
public void setSmsListener(IImsSmsListener l) {
MmTelFeature.this.setSmsListener(l);
}
@Override
@ -364,9 +356,6 @@ public class MmTelFeature extends ImsFeature {
@Retention(RetentionPolicy.SOURCE)
public @interface ProcessCallResult {}
// Lock for feature synchronization
private final Object mLock = new Object();
private IImsMmTelListener mListener;
/**
@ -376,9 +365,9 @@ public class MmTelFeature extends ImsFeature {
private void setListener(IImsMmTelListener listener) {
synchronized (mLock) {
mListener = listener;
}
if (mListener != null) {
onFeatureReady();
if (mListener != null) {
onFeatureReady();
}
}
}