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

Commit 0a95519d authored by Thomas Stuart's avatar Thomas Stuart Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I690f72c8b4512b04e27caed6c86cf2e617038384
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83fc66d1 7caec5a9

telecomm/java/android/telecom/CallAttributes.java

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



    /** @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,

            @NonNull CharSequence displayName,