diff options
| -rwxr-xr-x | telephony/java/android/telephony/ims/ImsCallSession.java | 407 |
1 files changed, 218 insertions, 189 deletions
diff --git a/telephony/java/android/telephony/ims/ImsCallSession.java b/telephony/java/android/telephony/ims/ImsCallSession.java index 6569de626702..d65286f26447 100755 --- a/telephony/java/android/telephony/ims/ImsCallSession.java +++ b/telephony/java/android/telephony/ims/ImsCallSession.java @@ -1212,50 +1212,56 @@ public class ImsCallSession { */ @Override public void callSessionInitiating(ImsCallProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionInitiating( - ImsCallSession.this, profile), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionInitiating(ImsCallSession.this, profile); + } + }, mListenerExecutor); } @Override public void callSessionProgressing(ImsStreamMediaProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionProgressing( - ImsCallSession.this, profile), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionProgressing(ImsCallSession.this, profile); + } + }, mListenerExecutor); } @Override public void callSessionInitiated(ImsCallProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionStarted( - ImsCallSession.this, profile), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionStarted(ImsCallSession.this, profile); + } + }, mListenerExecutor); } @Override public void callSessionInitiatingFailed(ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionStartFailed( - ImsCallSession.this, reasonInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionStartFailed(ImsCallSession.this, reasonInfo); + } + }, mListenerExecutor); } @Override public void callSessionInitiatedFailed(ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionStartFailed( - ImsCallSession.this, reasonInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionStartFailed(ImsCallSession.this, reasonInfo); + } + }, mListenerExecutor); } @Override public void callSessionTerminated(ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionTerminated( - ImsCallSession.this, reasonInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionTerminated(ImsCallSession.this, reasonInfo); + } + }, mListenerExecutor); } /** @@ -1263,51 +1269,56 @@ public class ImsCallSession { */ @Override public void callSessionHeld(ImsCallProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionHeld( - ImsCallSession.this, profile), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionHeld(ImsCallSession.this, profile); + } + }, mListenerExecutor); } @Override public void callSessionHoldFailed(ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionHoldFailed( - ImsCallSession.this, reasonInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionHoldFailed(ImsCallSession.this, reasonInfo); + } + }, mListenerExecutor); } @Override public void callSessionHoldReceived(ImsCallProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionHoldReceived( - ImsCallSession.this, profile), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionHoldReceived(ImsCallSession.this, profile); + } + }, mListenerExecutor); } @Override public void callSessionResumed(ImsCallProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionResumed( - ImsCallSession.this, profile), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionResumed(ImsCallSession.this, profile); + } + }, mListenerExecutor); } @Override public void callSessionResumeFailed(ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionResumeFailed( - ImsCallSession.this, reasonInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionResumeFailed(ImsCallSession.this, reasonInfo); + } + }, mListenerExecutor); } @Override public void callSessionResumeReceived(ImsCallProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionResumeReceived(ImsCallSession.this, profile), - mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionResumeReceived(ImsCallSession.this, profile); + } + }, mListenerExecutor); } /** @@ -1330,8 +1341,8 @@ public class ImsCallSession { */ @Override public void callSessionMergeComplete(IImsCallSession newSession) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> { + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { if (newSession != null) { // New session created after conference mListener.callSessionMergeComplete(new ImsCallSession(newSession)); @@ -1339,8 +1350,8 @@ public class ImsCallSession { // Session already exists. Hence no need to pass mListener.callSessionMergeComplete(null); } - }, mListenerExecutor); - } + } + }, mListenerExecutor); } /** @@ -1350,11 +1361,11 @@ public class ImsCallSession { */ @Override public void callSessionMergeFailed(ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionMergeFailed(ImsCallSession.this, reasonInfo), - mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionMergeFailed(ImsCallSession.this, reasonInfo); + } + }, mListenerExecutor); } /** @@ -1362,29 +1373,29 @@ public class ImsCallSession { */ @Override public void callSessionUpdated(ImsCallProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionUpdated(ImsCallSession.this, profile), - mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionUpdated(ImsCallSession.this, profile); + } + }, mListenerExecutor); } @Override public void callSessionUpdateFailed(ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionUpdateFailed(ImsCallSession.this, reasonInfo), - mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionUpdateFailed(ImsCallSession.this, reasonInfo); + } + }, mListenerExecutor); } @Override public void callSessionUpdateReceived(ImsCallProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionUpdateReceived(ImsCallSession.this, profile), - mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionUpdateReceived(ImsCallSession.this, profile); + } + }, mListenerExecutor); } /** @@ -1393,30 +1404,33 @@ public class ImsCallSession { @Override public void callSessionConferenceExtended(IImsCallSession newSession, ImsCallProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionConferenceExtended(ImsCallSession.this, - new ImsCallSession(newSession), profile), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionConferenceExtended(ImsCallSession.this, + new ImsCallSession(newSession), profile); + } + }, mListenerExecutor); } @Override public void callSessionConferenceExtendFailed(ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionConferenceExtendFailed( - ImsCallSession.this, reasonInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionConferenceExtendFailed( + ImsCallSession.this, reasonInfo); + } + }, mListenerExecutor); } @Override public void callSessionConferenceExtendReceived(IImsCallSession newSession, ImsCallProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionConferenceExtendReceived(ImsCallSession.this, - new ImsCallSession(newSession), profile), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionConferenceExtendReceived(ImsCallSession.this, + new ImsCallSession(newSession), profile); + } + }, mListenerExecutor); } /** @@ -1425,38 +1439,41 @@ public class ImsCallSession { */ @Override public void callSessionInviteParticipantsRequestDelivered() { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionInviteParticipantsRequestDelivered( - ImsCallSession.this), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionInviteParticipantsRequestDelivered( + ImsCallSession.this); + } + }, mListenerExecutor); } @Override public void callSessionInviteParticipantsRequestFailed(ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionInviteParticipantsRequestFailed(ImsCallSession.this, - reasonInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionInviteParticipantsRequestFailed(ImsCallSession.this, + reasonInfo); + } + }, mListenerExecutor); } @Override public void callSessionRemoveParticipantsRequestDelivered() { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionRemoveParticipantsRequestDelivered( - ImsCallSession.this), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionRemoveParticipantsRequestDelivered(ImsCallSession.this); + } + }, mListenerExecutor); } @Override public void callSessionRemoveParticipantsRequestFailed(ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionRemoveParticipantsRequestFailed(ImsCallSession.this, - reasonInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionRemoveParticipantsRequestFailed(ImsCallSession.this, + reasonInfo); + } + }, mListenerExecutor); } /** @@ -1464,11 +1481,11 @@ public class ImsCallSession { */ @Override public void callSessionConferenceStateUpdated(ImsConferenceState state) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionConferenceStateUpdated(ImsCallSession.this, state), - mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionConferenceStateUpdated(ImsCallSession.this, state); + } + }, mListenerExecutor); } /** @@ -1476,11 +1493,12 @@ public class ImsCallSession { */ @Override public void callSessionUssdMessageReceived(int mode, String ussdMessage) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionUssdMessageReceived(ImsCallSession.this, mode, - ussdMessage), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionUssdMessageReceived(ImsCallSession.this, mode, + ussdMessage); + } + }, mListenerExecutor); } /** @@ -1496,11 +1514,12 @@ public class ImsCallSession { */ @Override public void callSessionMayHandover(int srcNetworkType, int targetNetworkType) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionMayHandover(ImsCallSession.this, srcNetworkType, - targetNetworkType), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionMayHandover(ImsCallSession.this, srcNetworkType, + targetNetworkType); + } + }, mListenerExecutor); } /** @@ -1509,11 +1528,12 @@ public class ImsCallSession { @Override public void callSessionHandover(int srcNetworkType, int targetNetworkType, ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionHandover(ImsCallSession.this, srcNetworkType, - targetNetworkType, reasonInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionHandover(ImsCallSession.this, srcNetworkType, + targetNetworkType, reasonInfo); + } + }, mListenerExecutor); } /** @@ -1522,11 +1542,12 @@ public class ImsCallSession { @Override public void callSessionHandoverFailed(int srcNetworkType, int targetNetworkType, ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionHandoverFailed(ImsCallSession.this, srcNetworkType, - targetNetworkType, reasonInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionHandoverFailed(ImsCallSession.this, srcNetworkType, + targetNetworkType, reasonInfo); + } + }, mListenerExecutor); } /** @@ -1534,11 +1555,11 @@ public class ImsCallSession { */ @Override public void callSessionTtyModeReceived(int mode) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionTtyModeReceived(ImsCallSession.this, mode), - mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionTtyModeReceived(ImsCallSession.this, mode); + } + }, mListenerExecutor); } /** @@ -1548,20 +1569,22 @@ public class ImsCallSession { * otherwise. */ public void callSessionMultipartyStateChanged(boolean isMultiParty) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionMultipartyStateChanged(ImsCallSession.this, - isMultiParty), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionMultipartyStateChanged(ImsCallSession.this, + isMultiParty); + } + }, mListenerExecutor); } @Override public void callSessionSuppServiceReceived(ImsSuppServiceNotification suppServiceInfo ) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionSuppServiceReceived(ImsCallSession.this, - suppServiceInfo), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionSuppServiceReceived(ImsCallSession.this, + suppServiceInfo); + } + }, mListenerExecutor); } /** @@ -1569,11 +1592,12 @@ public class ImsCallSession { */ @Override public void callSessionRttModifyRequestReceived(ImsCallProfile callProfile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionRttModifyRequestReceived(ImsCallSession.this, - callProfile), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionRttModifyRequestReceived(ImsCallSession.this, + callProfile); + } + }, mListenerExecutor); } /** @@ -1581,11 +1605,11 @@ public class ImsCallSession { */ @Override public void callSessionRttModifyResponseReceived(int status) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionRttModifyResponseReceived(status), - mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionRttModifyResponseReceived(status); + } + }, mListenerExecutor); } /** @@ -1593,10 +1617,11 @@ public class ImsCallSession { */ @Override public void callSessionRttMessageReceived(String rttMessage) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionRttMessageReceived(rttMessage), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionRttMessageReceived(rttMessage); + } + }, mListenerExecutor); } /** @@ -1604,28 +1629,29 @@ public class ImsCallSession { */ @Override public void callSessionRttAudioIndicatorChanged(ImsStreamMediaProfile profile) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionRttAudioIndicatorChanged(profile), - mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionRttAudioIndicatorChanged(profile); + } + }, mListenerExecutor); } @Override public void callSessionTransferred() { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionTransferred(ImsCallSession.this), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionTransferred(ImsCallSession.this); + } + }, mListenerExecutor); } @Override public void callSessionTransferFailed(@Nullable ImsReasonInfo reasonInfo) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionTransferFailed(ImsCallSession.this, reasonInfo), - mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionTransferFailed(ImsCallSession.this, reasonInfo); + } + }, mListenerExecutor); } /** @@ -1634,10 +1660,11 @@ public class ImsCallSession { */ @Override public void callSessionDtmfReceived(char dtmf) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callSessionDtmfReceived( - dtmf), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionDtmfReceived(dtmf); + } + }, mListenerExecutor); } /** @@ -1645,10 +1672,11 @@ public class ImsCallSession { */ @Override public void callQualityChanged(CallQuality callQuality) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> mListener.callQualityChanged( - callQuality), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callQualityChanged(callQuality); + } + }, mListenerExecutor); } /** @@ -1658,11 +1686,12 @@ public class ImsCallSession { @Override public void callSessionRtpHeaderExtensionsReceived( @NonNull List<RtpHeaderExtension> extensions) { - if (mListener != null) { - TelephonyUtils.runWithCleanCallingIdentity(()-> - mListener.callSessionRtpHeaderExtensionsReceived( - new ArraySet<RtpHeaderExtension>(extensions)), mListenerExecutor); - } + TelephonyUtils.runWithCleanCallingIdentity(()-> { + if (mListener != null) { + mListener.callSessionRtpHeaderExtensionsReceived( + new ArraySet<RtpHeaderExtension>(extensions)); + } + }, mListenerExecutor); } } |