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

Commit d6d19e17 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Automerger Merge Worker
Browse files

Merge "Add mapping for PROPERTY_CROSS_SIM" into sc-dev am: 86f2074c am: d046910f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/13422943

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If056efaa928350a9c5730893f5454ea6e9ddaa59
parents 3d711cb5 d046910f

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

+4 −1
Original line number Diff line number Diff line
@@ -554,7 +554,10 @@ public class ParcelableCallUtils { 
        android.telecom.Call.Details.PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL,



        Connection.PROPERTY_IS_ADHOC_CONFERENCE,

        android.telecom.Call.Details.PROPERTY_IS_ADHOC_CONFERENCE

        android.telecom.Call.Details.PROPERTY_IS_ADHOC_CONFERENCE,



        Connection.PROPERTY_CROSS_SIM,

        android.telecom.Call.Details.PROPERTY_CROSS_SIM

    };



    private static int convertConnectionToCallProperties(int connectionProperties) {