Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "IMS: Check for binderstate before calling endSession"

Browse Source 
am: c49534cf09

Change-Id: I9d173693c466b7d8512d11f266af48f5307669d5
This commit is contained in:
Brad Ebinger
2017-06-27 16:57:11 +00:00
committed by android-build-merger
parent 4fee968fa8 c49534cf09
commit 1de1c2bb66
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/ims/ImsServiceProxy.java
View File

@@ -90,12 +90,12 @@ public class ImsServiceProxy extends ImsServiceProxyCompat implements IRcsFeatur
" status: " + status); " status: " + status);
if (mSlotId == slotId && feature == mSupportedFeature) { if (mSlotId == slotId && feature == mSupportedFeature) {
mFeatureStatusCached = status; mFeatureStatusCached = status;
}
}
if (mStatusCallback != null) { if (mStatusCallback != null) {
mStatusCallback.notifyStatusChanged(); mStatusCallback.notifyStatusChanged();
} }
} }
}
}
}; };
public ImsServiceProxy(int slotId, IBinder binder, int featureType) { public ImsServiceProxy(int slotId, IBinder binder, int featureType) {
@@ -129,7 +129,9 @@ public class ImsServiceProxy extends ImsServiceProxyCompat implements IRcsFeatur
@Override @Override
public void endSession(int sessionId) throws RemoteException { public void endSession(int sessionId) throws RemoteException {
synchronized (mLock) { synchronized (mLock) {
checkServiceIsReady(); // Only check to make sure the binder connection still exists. This method should
// still be able to be called when the state is STATE_NOT_AVAILABLE.
checkBinderConnection();
getServiceInterface(mBinder).endSession(mSlotId, mSupportedFeature, sessionId); getServiceInterface(mBinder).endSession(mSlotId, mSupportedFeature, sessionId);
} }
} }