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

Commit 64f05b10 authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Introduce IMS Cross SIM registration 

Introduce IMS Cross SIM registration

Bug: 171391883
Test: Build
Change-Id: Idd79a0a1f453a36587b89257e88437c96bf6ff4e
parent d1610878

core/api/current.txt

+7 −2
Original line number Diff line number Diff line
@@ -38764,6 +38764,7 @@ package android.telecom { 
    field public static final int DIRECTION_UNKNOWN = -1; // 0xffffffff

    field public static final int PROPERTY_ASSISTED_DIALING = 512; // 0x200

    field public static final int PROPERTY_CONFERENCE = 1; // 0x1

    field public static final int PROPERTY_CROSS_SIM = 16384; // 0x4000

    field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4

    field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20

    field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2
@@ -39057,6 +39058,7 @@ package android.telecom { 
    field public static final String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";

    field public static final String EXTRA_SIP_INVITE = "android.telecom.extra.SIP_INVITE";

    field public static final int PROPERTY_ASSISTED_DIALING = 512; // 0x200

    field public static final int PROPERTY_CROSS_SIM = 8192; // 0x2000

    field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20

    field public static final int PROPERTY_HIGH_DEF_AUDIO = 4; // 0x4

    field public static final int PROPERTY_IS_ADHOC_CONFERENCE = 4096; // 0x1000
@@ -42577,6 +42579,7 @@ package android.telephony.ims { 
    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RegistrationManager.RegistrationCallback) throws android.telephony.ims.ImsException;

    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback);

    field public static final int ATTR_EPDG_OVER_CELL_INTERNET = 1; // 0x1

    field public static final int REGISTRATION_STATE_NOT_REGISTERED = 0; // 0x0

    field public static final int REGISTRATION_STATE_REGISTERED = 2; // 0x2

    field public static final int REGISTRATION_STATE_REGISTERING = 1; // 0x1
@@ -42584,8 +42587,10 @@ package android.telephony.ims { 














  public static class RegistrationManager.RegistrationCallback {















    ctor public RegistrationManager.RegistrationCallback();













    method public void onRegistered(int);













    method public void onRegistering(int);













    method @Deprecated public void onRegistered(int);













    method public void onRegistered(int, int);













    method @Deprecated public void onRegistering(int);













    method public void onRegistering(int, int);















    method public void onTechnologyChangeFailed(int, @NonNull android.telephony.ims.ImsReasonInfo);















    method public void onUnregistered(@NonNull android.telephony.ims.ImsReasonInfo);















  }

























core/api/system-current.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -12150,6 +12150,7 @@ package android.telephony.ims {













    field public static final String EXTRA_EXTENDING_TO_CONFERENCE_SUPPORTED = "android.telephony.ims.extra.EXTENDING_TO_CONFERENCE_SUPPORTED";















    field public static final String EXTRA_FORWARDED_NUMBER = "android.telephony.ims.extra.FORWARDED_NUMBER";















    field public static final String EXTRA_IS_CALL_PULL = "CallPull";













    field public static final String EXTRA_IS_CROSS_SIM_CALL = "android.telephony.ims.extra.IS_CROSS_SIM_CALL";















    field public static final String EXTRA_LOCATION = "android.telephony.ims.extra.LOCATION";















    field public static final String EXTRA_OI = "oi";















    field public static final String EXTRA_OIR = "oir";










@@ -12292,6 +12293,8 @@ package android.telephony.ims {



























  @Deprecated public static class ImsMmTelManager.RegistrationCallback extends android.telephony.ims.RegistrationManager.RegistrationCallback {















    ctor @Deprecated public ImsMmTelManager.RegistrationCallback();













    method @Deprecated public void onRegistered(int);













    method @Deprecated public void onRegistering(int);















  }





























  public final class ImsReasonInfo implements android.os.Parcelable {










@@ -12931,6 +12934,7 @@ package android.telephony.ims.stub {













    method public void triggerFullNetworkRegistration(@IntRange(from=100, to=699) int, @Nullable String);















    method public void triggerSipDelegateDeregistration();















    method public void updateSipDelegateRegistration();













    field public static final int REGISTRATION_TECH_CROSS_SIM = 2; // 0x2















    field public static final int REGISTRATION_TECH_IWLAN = 1; // 0x1















    field public static final int REGISTRATION_TECH_LTE = 0; // 0x0















    field public static final int REGISTRATION_TECH_NONE = -1; // 0xffffffff

























core/res/res/values/strings.xml



+11
−0




























Original line number
Diff line number
Diff line








@@ -292,6 +292,17 @@













    <!-- WFC, summary for Wi-Fi Only -->















    <string name="wfc_mode_wifi_only_summary">Wi-Fi only</string>





























    <!-- Template for showing mobile network operator name while Cross SIM calling is active -->













    <string-array name="crossSimSpnFormats" translatable="false">













        <item>@string/crossSimFormat_spn</item>













        <item>@string/crossSimFormat_spn_cross_sim_calling</item>













    </string-array>



























    <!-- Spn during Cross-SIM Calling: "<operator> " [CHAR LIMIT=NONE] -->













    <string name="crossSimFormat_spn"><xliff:g id="spn" example="Operator">%s</xliff:g></string>













    <!-- Spn during Cross SIM Calling: "<operator> Cross-SIM Calling" [CHAR LIMIT=NONE] -->













    <string name="crossSimFormat_spn_cross_sim_calling"><xliff:g id="spn" example="Operator">%s</xliff:g> Cross-SIM Calling</string>





























    <!--















        {0} is one of "bearerServiceCode*"















        {1} is dialing number

































core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -874,6 +874,7 @@













  <java-symbol type="string" name="wfc_mode_wifi_preferred_summary" />















  <java-symbol type="string" name="wfc_mode_cellular_preferred_summary" />















  <java-symbol type="string" name="wfc_mode_wifi_only_summary" />













  <java-symbol type="array" name="crossSimSpnFormats" />















  <java-symbol type="string" name="policydesc_disableCamera" />















  <java-symbol type="string" name="policydesc_encryptedStorage" />















  <java-symbol type="string" name="policydesc_expirePassword" />

































telecomm/java/android/telecom/Call.java



+8
−0




























Original line number
Diff line number
Diff line








@@ -607,6 +607,11 @@ public final class Call {













         */















        public static final int PROPERTY_IS_ADHOC_CONFERENCE = 0x00002000;





























        /**













         * Connection is using Cross SIM Calling.













         */













        public static final int PROPERTY_CROSS_SIM = 0x00004000;





























        //******************************************************************************************















        // Next PROPERTY value: 0x00004000















        //******************************************************************************************










@@ -798,6 +803,9 @@ public final class Call {













            if (hasProperty(properties, PROPERTY_IS_ADHOC_CONFERENCE)) {















                builder.append(" PROPERTY_IS_ADHOC_CONFERENCE");















            }













            if (hasProperty(properties, PROPERTY_CROSS_SIM)) {













                builder.append(" PROPERTY_CROSS_SIM");













            }















            builder.append("]");















            return builder.toString();















        }