Merge changes from topic "cross-sim" (7055520b) · Commits · e / os / android_frameworks_base

core/api/current.txt

+8 −2

Original line number	Diff line number	Diff line
		@@ -38768,6 +38768,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
		@@ -39061,6 +39062,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
		@@ -42364,6 +42366,7 @@ package android.telephony.ims {
		method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public int getVoWiFiModeSetting();
		method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isAdvancedCallingSettingEnabled();
		method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isCrossSimCallingEnabledByUser() throws android.telephony.ims.ImsException;
		method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isTtyOverVolteEnabled();
		method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isVoWiFiRoamingSettingEnabled();
		method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isVoWiFiSettingEnabled();
		@@ -42580,6 +42583,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
		@@ -42587,8 +42591,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

+6 −0

Original line number	Diff line number	Diff line
		@@ -11134,6 +11134,7 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUiccApplicationsEnabled(int, boolean);
		field @RequiresPermission(android.Manifest.permission.MANAGE_SUBSCRIPTION_PLANS) public static final String ACTION_SUBSCRIPTION_PLANS_CHANGED = "android.telephony.action.SUBSCRIPTION_PLANS_CHANGED";
		field @NonNull public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI;
		field @NonNull public static final android.net.Uri CROSS_SIM_ENABLED_CONTENT_URI;
		field @Deprecated public static final int PROFILE_CLASS_DEFAULT = -1; // 0xffffffff
		field public static final int PROFILE_CLASS_OPERATIONAL = 2; // 0x2
		field public static final int PROFILE_CLASS_PROVISIONING = 1; // 0x1
		@@ -12196,6 +12197,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";
		@@ -12325,6 +12327,7 @@ package android.telephony.ims {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void isSupported(int, int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>) throws android.telephony.ims.ImsException;
		method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.RegistrationCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAdvancedCallingSettingEnabled(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCrossSimCallingEnabled(boolean) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRttCapabilitySetting(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiModeSetting(int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiNonPersistent(boolean, int);
		@@ -12337,6 +12340,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 {
		@@ -12976,6 +12981,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
		@@ -875,6 +875,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();
		}