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

Commit f9048005 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Ensure IMS conference participants have number presentation set." into oc-dr1-dev 

am: a3198af0

Change-Id: I1ae4e2d61e39bfa61fe4d75662aa1f22d858dea6
parents ab55a05b a3198af0

src/com/android/server/telecom/Call.java

+17 −0
Original line number Diff line number Diff line
@@ -660,6 +660,23 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable { 


        s.append("\n\tTo address: ");

        s.append(Log.piiHandle(getHandle()));

        s.append(" Presentation: ");

        switch (getHandlePresentation()) {

            case TelecomManager.PRESENTATION_ALLOWED:

                s.append("Allowed");

                break;

            case TelecomManager.PRESENTATION_PAYPHONE:

                s.append("Payphone");

                break;

            case TelecomManager.PRESENTATION_RESTRICTED:

                s.append("Restricted");

                break;

            case TelecomManager.PRESENTATION_UNKNOWN:

                s.append("Unknown");

                break;

            default:

                s.append("<undefined>");

        }

        s.append("\n");

        return s.toString();

    }

src/com/android/server/telecom/CallsManager.java

+1 −0
Original line number Diff line number Diff line
@@ -2687,6 +2687,7 @@ public class CallsManager extends Call.ListenerBase 
                "existing connection");

        call.setConnectionCapabilities(connection.getConnectionCapabilities());

        call.setConnectionProperties(connection.getConnectionProperties());

        call.setHandle(connection.getHandle(), connection.getHandlePresentation());

        call.setCallerDisplayName(connection.getCallerDisplayName(),

                connection.getCallerDisplayNamePresentation());

        call.addListener(this);