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

Commit fb201cc2 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "fix security exception in VoipCallMonitor" into udc-dev am:... 

Merge "Merge "fix security exception in VoipCallMonitor" into udc-dev am: fa337258 am: 7caec5a9"
parents c14bc607 0a95519d

telecomm/java/android/telecom/CallAttributes.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,10 @@ public final class CallAttributes implements Parcelable { 
    public static final String CALL_CAPABILITIES_KEY = "TelecomCapabilities";

    public static final String CALL_CAPABILITIES_KEY = "TelecomCapabilities";





    /** @hide **/

    /** @hide **/

    public static final String CALLER_PID = "CallerPid";

    public static final String CALLER_PID_KEY = "CallerPid";



    /** @hide **/

    public static final String CALLER_UID_KEY = "CallerUid";





    private CallAttributes(@NonNull PhoneAccountHandle phoneAccountHandle,

    private CallAttributes(@NonNull PhoneAccountHandle phoneAccountHandle,

            @NonNull CharSequence displayName,

            @NonNull CharSequence displayName,