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

Add a BARRING_TYPE_UNKNOWN for Unreported Barring am: 3c5e57cd07

Browse Source 
Change-Id: I4bca54225edde80df0c5e587a3f0f753bded393d
This commit is contained in:
Nathan Harold
2020-03-19 00:08:30 +00:00
committed by Automerger Merge Worker
parent ae39e7a551 3c5e57cd07
commit 5fa0fade08
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -44709,6 +44709,7 @@ package android.telephony {
field public static final int BARRING_TYPE_CONDITIONAL = 1; // 0x1
field public static final int BARRING_TYPE_NONE = 0; // 0x0
field public static final int BARRING_TYPE_UNCONDITIONAL = 2; // 0x2
field public static final int BARRING_TYPE_UNKNOWN = -1; // 0xffffffff
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.BarringInfo.BarringServiceInfo> CREATOR;
}

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

@@ -107,7 +107,8 @@ public final class BarringInfo implements Parcelable {
@IntDef(prefix = "BARRING_TYPE_", value =
{BARRING_TYPE_NONE,
BARRING_TYPE_UNCONDITIONAL,
BARRING_TYPE_CONDITIONAL})
BARRING_TYPE_CONDITIONAL,
BARRING_TYPE_UNKNOWN})
public @interface BarringType {}
/** Barring is inactive */
@@ -119,6 +120,9 @@ public final class BarringInfo implements Parcelable {
public static final int BARRING_TYPE_CONDITIONAL =
android.hardware.radio.V1_5.BarringType.CONDITIONAL;
/** If a modem does not report barring info, then the barring type will be UNKNOWN */
public static final int BARRING_TYPE_UNKNOWN = -1;
private final @BarringType int mBarringType;
private final boolean mIsConditionallyBarred;
@@ -126,8 +130,8 @@ public final class BarringInfo implements Parcelable {
private final int mConditionalBarringTimeSeconds;
/** @hide */
public BarringServiceInfo() {
this(BARRING_TYPE_NONE, false, 0, 0);
public BarringServiceInfo(@BarringType int type) {
this(type, false, 0, 0);
}
/** @hide */
@@ -311,7 +315,13 @@ public final class BarringInfo implements Parcelable {
*/
public @NonNull BarringServiceInfo getBarringServiceInfo(@BarringServiceType int service) {
BarringServiceInfo bsi = mBarringServiceInfos.get(service);
return (bsi != null) ? bsi : new BarringServiceInfo();
// If barring is reported but not for a particular service, then we report the barring
// type as UNKNOWN; if the modem reports barring info but doesn't report for a particular
// service then we can safely assume that the service isn't barred (for instance because
// that particular service isn't applicable to the current RAN).
return (bsi != null) ? bsi : new BarringServiceInfo(
mBarringServiceInfos.size() > 0 ? BarringServiceInfo.BARRING_TYPE_NONE :
BarringServiceInfo.BARRING_TYPE_UNKNOWN);
}
/** @hide */