Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cac05ad7 authored by Hakjun Choi's avatar Hakjun Choi Committed by Automerger Merge Worker
Browse files

Merge "return cached value for call id instead of calling AIDL" into udc-dev... 

Merge "return cached value for call id instead of calling AIDL" into udc-dev am: c610a9e9 am: e3abe8de

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21553959



Change-Id: Id5f423a6233558939d8240ba8a5ad9ff636aed03
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15aa8247 e3abe8de

telephony/java/android/telephony/ims/ImsCallSession.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -584,6 +584,7 @@ public class ImsCallSession { 
     * Gets the call ID of the session.

     * Gets the call ID of the session.

     *

     *

     * @return the call ID

     * @return the call ID

     * If null is returned for getCallId, then that means that the call ID has not been set yet.

     */

     */

    public String getCallId() {

    public String getCallId() {

        if (mClosed) {

        if (mClosed) {
@@ -1779,7 +1780,7 @@ public class ImsCallSession { 
        sb.append("[ImsCallSession objId:");

        sb.append("[ImsCallSession objId:");

        sb.append(System.identityHashCode(this));

        sb.append(System.identityHashCode(this));

        sb.append(" callId:");

        sb.append(" callId:");

        sb.append(getCallId());

        sb.append(mCallId != null ? mCallId : "[UNINITIALIZED]");

        sb.append("]");

        sb.append("]");

        return sb.toString();

        return sb.toString();

    }

    }