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

Update BarringInfo as Barring HAL date stuctures updated am: 2251158835

Browse Source 
Change-Id: I4df420ae5324fd89180e09a851b9b8ebeea555bb
This commit is contained in:
Rambo Wang
2020-03-19 00:08:35 +00:00
committed by Automerger Merge Worker
parent 5fa0fade08 2251158835
commit 36809febde
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
telephony/java/android/telephony/BarringInfo.java
View File

@@ -62,38 +62,38 @@ public final class BarringInfo implements Parcelable {
/* Applicabe to UTRAN */ /* Applicabe to UTRAN */
/** Barring indicator for circuit-switched service; applicable to UTRAN */ /** Barring indicator for circuit-switched service; applicable to UTRAN */
public static final int BARRING_SERVICE_TYPE_CS_SERVICE = public static final int BARRING_SERVICE_TYPE_CS_SERVICE =
android.hardware.radio.V1_5.BarringServiceType.CS_SERVICE; android.hardware.radio.V1_5.BarringInfo.ServiceType.CS_SERVICE;
/** Barring indicator for packet-switched service; applicable to UTRAN */ /** Barring indicator for packet-switched service; applicable to UTRAN */
public static final int BARRING_SERVICE_TYPE_PS_SERVICE = public static final int BARRING_SERVICE_TYPE_PS_SERVICE =
android.hardware.radio.V1_5.BarringServiceType.PS_SERVICE; android.hardware.radio.V1_5.BarringInfo.ServiceType.PS_SERVICE;
/** Barring indicator for circuit-switched voice service; applicable to UTRAN */ /** Barring indicator for circuit-switched voice service; applicable to UTRAN */
public static final int BARRING_SERVICE_TYPE_CS_VOICE = public static final int BARRING_SERVICE_TYPE_CS_VOICE =
android.hardware.radio.V1_5.BarringServiceType.CS_VOICE; android.hardware.radio.V1_5.BarringInfo.ServiceType.CS_VOICE;
/* Applicable to EUTRAN, NGRAN */ /* Applicable to EUTRAN, NGRAN */
/** Barring indicator for mobile-originated signalling; applicable to EUTRAN and NGRAN */ /** Barring indicator for mobile-originated signalling; applicable to EUTRAN and NGRAN */
public static final int BARRING_SERVICE_TYPE_MO_SIGNALLING = public static final int BARRING_SERVICE_TYPE_MO_SIGNALLING =
android.hardware.radio.V1_5.BarringServiceType.MO_SIGNALLING; android.hardware.radio.V1_5.BarringInfo.ServiceType.MO_SIGNALLING;
/** Barring indicator for mobile-originated data traffic; applicable to EUTRAN and NGRAN */ /** Barring indicator for mobile-originated data traffic; applicable to EUTRAN and NGRAN */
public static final int BARRING_SERVICE_TYPE_MO_DATA = public static final int BARRING_SERVICE_TYPE_MO_DATA =
android.hardware.radio.V1_5.BarringServiceType.MO_DATA; android.hardware.radio.V1_5.BarringInfo.ServiceType.MO_DATA;
/** Barring indicator for circuit-switched fallback for voice; applicable to EUTRAN and NGRAN */ /** Barring indicator for circuit-switched fallback for voice; applicable to EUTRAN and NGRAN */
public static final int BARRING_SERVICE_TYPE_CS_FALLBACK = public static final int BARRING_SERVICE_TYPE_CS_FALLBACK =
android.hardware.radio.V1_5.BarringServiceType.CS_FALLBACK; android.hardware.radio.V1_5.BarringInfo.ServiceType.CS_FALLBACK;
/** Barring indicator for MMTEL (IMS) voice; applicable to EUTRAN and NGRAN */ /** Barring indicator for MMTEL (IMS) voice; applicable to EUTRAN and NGRAN */
public static final int BARRING_SERVICE_TYPE_MMTEL_VOICE = public static final int BARRING_SERVICE_TYPE_MMTEL_VOICE =
android.hardware.radio.V1_5.BarringServiceType.MMTEL_VOICE; android.hardware.radio.V1_5.BarringInfo.ServiceType.MMTEL_VOICE;
/** Barring indicator for MMTEL (IMS) video; applicable to EUTRAN and NGRAN */ /** Barring indicator for MMTEL (IMS) video; applicable to EUTRAN and NGRAN */
public static final int BARRING_SERVICE_TYPE_MMTEL_VIDEO = public static final int BARRING_SERVICE_TYPE_MMTEL_VIDEO =
android.hardware.radio.V1_5.BarringServiceType.MMTEL_VIDEO; android.hardware.radio.V1_5.BarringInfo.ServiceType.MMTEL_VIDEO;
/* Applicable to UTRAN, EUTRAN, NGRAN */ /* Applicable to UTRAN, EUTRAN, NGRAN */
/** Barring indicator for emergency services; applicable to UTRAN, EUTRAN, and NGRAN */ /** Barring indicator for emergency services; applicable to UTRAN, EUTRAN, and NGRAN */
public static final int BARRING_SERVICE_TYPE_EMERGENCY = public static final int BARRING_SERVICE_TYPE_EMERGENCY =
android.hardware.radio.V1_5.BarringServiceType.EMERGENCY; android.hardware.radio.V1_5.BarringInfo.ServiceType.EMERGENCY;
/** Barring indicator for SMS sending; applicable to UTRAN, EUTRAN, and NGRAN */ /** Barring indicator for SMS sending; applicable to UTRAN, EUTRAN, and NGRAN */
public static final int BARRING_SERVICE_TYPE_SMS = public static final int BARRING_SERVICE_TYPE_SMS =
android.hardware.radio.V1_5.BarringServiceType.SMS; android.hardware.radio.V1_5.BarringInfo.ServiceType.SMS;
//TODO: add barring constants for Operator-Specific barring codes //TODO: add barring constants for Operator-Specific barring codes
@@ -112,13 +112,14 @@ public final class BarringInfo implements Parcelable {
public @interface BarringType {} public @interface BarringType {}
/** Barring is inactive */ /** Barring is inactive */
public static final int BARRING_TYPE_NONE = android.hardware.radio.V1_5.BarringType.NONE; public static final int BARRING_TYPE_NONE =
android.hardware.radio.V1_5.BarringInfo.BarringType.NONE;
/** The service is barred */ /** The service is barred */
public static final int BARRING_TYPE_UNCONDITIONAL = public static final int BARRING_TYPE_UNCONDITIONAL =
android.hardware.radio.V1_5.BarringType.UNCONDITIONAL; android.hardware.radio.V1_5.BarringInfo.BarringType.UNCONDITIONAL;
/** The service may be barred based on additional factors */ /** The service may be barred based on additional factors */
public static final int BARRING_TYPE_CONDITIONAL = public static final int BARRING_TYPE_CONDITIONAL =
android.hardware.radio.V1_5.BarringType.CONDITIONAL; android.hardware.radio.V1_5.BarringInfo.BarringType.CONDITIONAL;
/** If a modem does not report barring info, then the barring type will be UNKNOWN */ /** If a modem does not report barring info, then the barring type will be UNKNOWN */
public static final int BARRING_TYPE_UNKNOWN = -1; public static final int BARRING_TYPE_UNKNOWN = -1;
@@ -271,27 +272,29 @@ public final class BarringInfo implements Parcelable {
SparseArray<BarringServiceInfo> serviceInfos = new SparseArray<>(); SparseArray<BarringServiceInfo> serviceInfos = new SparseArray<>();
for (android.hardware.radio.V1_5.BarringInfo halBarringInfo : halBarringInfos) { for (android.hardware.radio.V1_5.BarringInfo halBarringInfo : halBarringInfos) {
if (halBarringInfo.type == android.hardware.radio.V1_5.BarringType.CONDITIONAL) { if (halBarringInfo.barringType
if (halBarringInfo.typeSpecificInfo.getDiscriminator() == android.hardware.radio.V1_5.BarringInfo.BarringType.CONDITIONAL) {
!= android.hardware.radio.V1_5.BarringTypeSpecificInfo if (halBarringInfo.barringTypeSpecificInfo.getDiscriminator()
.hidl_discriminator.conditionalBarringInfo) { != android.hardware.radio.V1_5.BarringInfo.BarringTypeSpecificInfo
.hidl_discriminator.conditional) {
// this is an error case where the barring info is conditional but the // this is an error case where the barring info is conditional but the
// conditional barring fields weren't included // conditional barring fields weren't included
continue; continue;
} }
android.hardware.radio.V1_5.ConditionalBarringInfo conditionalInfo = android.hardware.radio.V1_5.BarringInfo.BarringTypeSpecificInfo
halBarringInfo.typeSpecificInfo.conditionalBarringInfo(); .Conditional conditionalInfo =
halBarringInfo.barringTypeSpecificInfo.conditional();
serviceInfos.put( serviceInfos.put(
halBarringInfo.service, new BarringServiceInfo( halBarringInfo.serviceType, new BarringServiceInfo(
halBarringInfo.type, // will always be CONDITIONAL here halBarringInfo.barringType, // will always be CONDITIONAL here
conditionalInfo.isBarred, conditionalInfo.isBarred,
conditionalInfo.barringFactor, conditionalInfo.factor,
conditionalInfo.barringTimeSeconds)); conditionalInfo.timeSeconds));
} else { } else {
// Barring type is either NONE or UNCONDITIONAL // Barring type is either NONE or UNCONDITIONAL
serviceInfos.put( serviceInfos.put(
halBarringInfo.service, new BarringServiceInfo(halBarringInfo.type, halBarringInfo.serviceType, new BarringServiceInfo(
false, 0, 0)); halBarringInfo.barringType, false, 0, 0));
} }
} }
return new BarringInfo(ci, serviceInfos); return new BarringInfo(ci, serviceInfos);