Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add carrier config keys for GBA" am: 7715ad3ac8 am: dbc2a426ba

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657761

Change-Id: I78f1661d3f18daa5e575b8fe6af2564fb495bcda
This commit is contained in:
Treehugger Robot
2021-03-30 17:44:10 +00:00
committed by Automerger Merge Worker
parent 463d2f3f27 dbc2a426ba
commit 3ba12c704b
2 changed files with 81 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/api/system-current.txt
View File

@@ -9434,7 +9434,14 @@ package android.telephony {
method @NonNull public static android.os.PersistableBundle getDefaultConfig();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void overrideConfig(int, @Nullable android.os.PersistableBundle);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void updateConfigForPhoneId(int, String);
field public static final int GBA_DIGEST = 3; // 0x3
field public static final int GBA_ME = 1; // 0x1
field public static final int GBA_U = 2; // 0x2
field public static final String KEY_CARRIER_SETUP_APP_STRING = "carrier_setup_app_string";
field public static final String KEY_GBA_MODE_INT = "gba_mode_int";
field public static final String KEY_GBA_UA_SECURITY_ORGANIZATION_INT = "gba_ua_security_organization_int";
field public static final String KEY_GBA_UA_SECURITY_PROTOCOL_INT = "gba_ua_security_protocol_int";
field public static final String KEY_GBA_UA_TLS_CIPHER_SUITE_INT = "gba_ua_tls_cipher_suite_int";
field public static final String KEY_SUPPORT_CDMA_1X_VOICE_CALLS_BOOL = "support_cdma_1x_voice_calls_bool";
}

76
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -17,7 +17,6 @@
package android.telephony;
import android.Manifest;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
@@ -32,10 +31,11 @@ import android.os.PersistableBundle;
import android.os.RemoteException;
import android.service.carrier.CarrierService;
import android.telecom.TelecomManager;
import android.telephony.gba.TlsParams;
import android.telephony.gba.UaSecurityProtocolIdentifier;
import android.telephony.ims.ImsReasonInfo;
import android.telephony.ims.ImsRegistrationAttributes;
import android.telephony.ims.ImsSsData;
import android.telephony.ims.SipDelegateManager;
import android.telephony.ims.feature.MmTelFeature;
import android.telephony.ims.feature.RcsFeature;
@@ -3615,6 +3615,71 @@ public class CarrierConfigManager {
*/
public static final String ENABLE_EAP_METHOD_PREFIX_BOOL = "enable_eap_method_prefix_bool";
/**
* Indicates that GBA_ME should be used for GBA authentication, as defined in 3GPP TS 33.220.
* @hide
*/
@SystemApi
public static final int GBA_ME = 1;
/**
* Indicates that GBA_U should be used for GBA authentication, as defined in 3GPP TS 33.220.
* @hide
*/
@SystemApi
public static final int GBA_U = 2;
/**
* Indicates that GBA_Digest should be used for GBA authentication, as defined
* in 3GPP TS 33.220.
* @hide
*/
@SystemApi
public static final int GBA_DIGEST = 3;
/**
* An integer representing the GBA mode to use for requesting credentials
* via {@link TelephonyManager#bootstrapAuthenticationRequest}.
*
* One of {@link #GBA_ME}, {@link #GBA_U}, or {@link #GBA_DIGEST}.
* @hide
*/
@SystemApi
public static final String KEY_GBA_MODE_INT = "gba_mode_int";
/**
* An integer representing the organization code to be used when building the
* {@link UaSecurityProtocolIdentifier} used when requesting GBA authentication.
*
* See the {@code ORG_} constants in {@link UaSecurityProtocolIdentifier}.
* @hide
*/
@SystemApi
public static final String KEY_GBA_UA_SECURITY_ORGANIZATION_INT =
"gba_ua_security_organization_int";
/**
* An integer representing the security protocol to be used when building the
* {@link UaSecurityProtocolIdentifier} used when requesting GBA authentication.
*
* See the {@code UA_SECURITY_PROTOCOL_} constants in {@link UaSecurityProtocolIdentifier}.
* @hide
*/
@SystemApi
public static final String KEY_GBA_UA_SECURITY_PROTOCOL_INT =
"gba_ua_security_protocol_int";
/**
* An integer representing the cipher suite to be used when building the
* {@link UaSecurityProtocolIdentifier} used when requesting GBA authentication.
*
* See the {@code TLS_} constants in {@link android.telephony.gba.TlsParams}.
* @hide
*/
@SystemApi
public static final String KEY_GBA_UA_TLS_CIPHER_SUITE_INT =
"gba_ua_tls_cipher_suite_int";
/**
* GPS configs. See the GNSS HAL documentation for more details.
*/
@@ -4823,6 +4888,13 @@ public class CarrierConfigManager {
// Default wifi configurations.
sDefaults.putAll(Wifi.getDefaults());
sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false);
sDefaults.putInt(KEY_GBA_MODE_INT, GBA_ME);
sDefaults.putInt(KEY_GBA_UA_SECURITY_ORGANIZATION_INT,
UaSecurityProtocolIdentifier.ORG_3GPP);
sDefaults.putInt(KEY_GBA_UA_SECURITY_PROTOCOL_INT,
UaSecurityProtocolIdentifier.UA_SECURITY_PROTOCOL_3GPP_TLS_DEFAULT);
sDefaults.putInt(KEY_GBA_UA_TLS_CIPHER_SUITE_INT, TlsParams.TLS_NULL_WITH_NULL_NULL);
sDefaults.putBoolean(KEY_SHOW_FORWARDED_NUMBER_BOOL, false);
sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, TimeUnit.DAYS.toMillis(1));
sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY,