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

Merge "Add Handover Failure Mode to Radio Hal" am: f86143770f am: 8cae5f921c

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

Change-Id: I59541adf98e8b992ef8af5f2a452fc0ddc5fc28a
This commit is contained in:
Daniel Bright
2020-10-22 23:22:12 +00:00
committed by Automerger Merge Worker
parent 70ad24f2df 8cae5f921c
commit 6f5eda09a7
5 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -465,6 +465,7 @@ java_library {
"android.hardware.radio-V1.3-java", "android.hardware.radio-V1.3-java",
"android.hardware.radio-V1.4-java", "android.hardware.radio-V1.4-java",
"android.hardware.radio-V1.5-java", "android.hardware.radio-V1.5-java",
"android.hardware.radio-V1.6-java",
"android.hardware.thermal-V1.0-java-constants", "android.hardware.thermal-V1.0-java-constants",
"android.hardware.thermal-V1.0-java", "android.hardware.thermal-V1.0-java",
"android.hardware.thermal-V1.1-java", "android.hardware.thermal-V1.1-java",

10
api/system-current.txt
View File

@@ -11466,11 +11466,11 @@ package android.telephony.data {
method public int getSuggestedRetryTime(); method public int getSuggestedRetryTime();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.DataCallResponse> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.DataCallResponse> CREATOR;
field public static final int HANDOVER_FAILURE_MODE_DO_FALLBACK = 2; // 0x2 field public static final int HANDOVER_FAILURE_MODE_DO_FALLBACK = 1; // 0x1
field public static final int HANDOVER_FAILURE_MODE_LEGACY = 1; // 0x1 field public static final int HANDOVER_FAILURE_MODE_LEGACY = 0; // 0x0
field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_HANDOVER = 3; // 0x3 field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_HANDOVER = 2; // 0x2
field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL = 4; // 0x4 field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL = 3; // 0x3
field public static final int HANDOVER_FAILURE_MODE_UNKNOWN = 0; // 0x0 field public static final int HANDOVER_FAILURE_MODE_UNKNOWN = -1; // 0xffffffff
field public static final int LINK_STATUS_ACTIVE = 2; // 0x2 field public static final int LINK_STATUS_ACTIVE = 2; // 0x2
field public static final int LINK_STATUS_DORMANT = 1; // 0x1 field public static final int LINK_STATUS_DORMANT = 1; // 0x1
field public static final int LINK_STATUS_INACTIVE = 0; // 0x0 field public static final int LINK_STATUS_INACTIVE = 0; // 0x0

10
non-updatable-api/system-current.txt
View File

@@ -10348,11 +10348,11 @@ package android.telephony.data {
method public int getSuggestedRetryTime(); method public int getSuggestedRetryTime();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.DataCallResponse> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.DataCallResponse> CREATOR;
field public static final int HANDOVER_FAILURE_MODE_DO_FALLBACK = 2; // 0x2 field public static final int HANDOVER_FAILURE_MODE_DO_FALLBACK = 1; // 0x1
field public static final int HANDOVER_FAILURE_MODE_LEGACY = 1; // 0x1 field public static final int HANDOVER_FAILURE_MODE_LEGACY = 0; // 0x0
field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_HANDOVER = 3; // 0x3 field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_HANDOVER = 2; // 0x2
field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL = 4; // 0x4 field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL = 3; // 0x3
field public static final int HANDOVER_FAILURE_MODE_UNKNOWN = 0; // 0x0 field public static final int HANDOVER_FAILURE_MODE_UNKNOWN = -1; // 0xffffffff
field public static final int LINK_STATUS_ACTIVE = 2; // 0x2 field public static final int LINK_STATUS_ACTIVE = 2; // 0x2
field public static final int LINK_STATUS_DORMANT = 1; // 0x1 field public static final int LINK_STATUS_DORMANT = 1; // 0x1
field public static final int LINK_STATUS_INACTIVE = 0; // 0x0 field public static final int LINK_STATUS_INACTIVE = 0; // 0x0

10
telephony/api/system-current.txt
View File

@@ -922,11 +922,11 @@ package android.telephony.data {
method public int getSuggestedRetryTime(); method public int getSuggestedRetryTime();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.DataCallResponse> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.DataCallResponse> CREATOR;
field public static final int HANDOVER_FAILURE_MODE_DO_FALLBACK = 2; // 0x2 field public static final int HANDOVER_FAILURE_MODE_DO_FALLBACK = 1; // 0x1
field public static final int HANDOVER_FAILURE_MODE_LEGACY = 1; // 0x1 field public static final int HANDOVER_FAILURE_MODE_LEGACY = 0; // 0x0
field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_HANDOVER = 3; // 0x3 field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_HANDOVER = 2; // 0x2
field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL = 4; // 0x4 field public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL = 3; // 0x3
field public static final int HANDOVER_FAILURE_MODE_UNKNOWN = 0; // 0x0 field public static final int HANDOVER_FAILURE_MODE_UNKNOWN = -1; // 0xffffffff
field public static final int LINK_STATUS_ACTIVE = 2; // 0x2 field public static final int LINK_STATUS_ACTIVE = 2; // 0x2
field public static final int LINK_STATUS_DORMANT = 1; // 0x1 field public static final int LINK_STATUS_DORMANT = 1; // 0x1
field public static final int LINK_STATUS_INACTIVE = 0; // 0x0 field public static final int LINK_STATUS_INACTIVE = 0; // 0x0

20
telephony/java/android/telephony/data/DataCallResponse.java
View File

@@ -80,33 +80,33 @@ public final class DataCallResponse implements Parcelable {
/** /**
* Data handover failure mode is unknown. * Data handover failure mode is unknown.
*/ */
public static final int HANDOVER_FAILURE_MODE_UNKNOWN = 0; public static final int HANDOVER_FAILURE_MODE_UNKNOWN = -1;
/** /**
* Perform fallback to the source data transport on data handover failure using * Perform fallback to the source data transport on data handover failure using
* the legacy logic, which is fallback if the fail cause is * the legacy logic, which is fallback if the fail cause is
* {@link DataFailCause#HANDOFF_PREFERENCE_CHANGED}. * {@link DataFailCause#HANDOFF_PREFERENCE_CHANGED}.
*/ */
public static final int HANDOVER_FAILURE_MODE_LEGACY = 1; public static final int HANDOVER_FAILURE_MODE_LEGACY = 0;
/** /**
* Perform fallback to the source data transport on data handover failure. * Perform fallback to the source data transport on data handover failure.
*/ */
public static final int HANDOVER_FAILURE_MODE_DO_FALLBACK = 2; public static final int HANDOVER_FAILURE_MODE_DO_FALLBACK = 1;
/** /**
* Do not perform fallback to the source data transport on data handover failure. * Do not perform fallback to the source data transport on data handover failure.
* Frameworks should keep retrying handover by sending * Framework will retry setting up a new data connection by sending
* {@link DataService#REQUEST_REASON_HANDOVER} request to the underlying {@link DataService}. * {@link DataService#REQUEST_REASON_HANDOVER} request to the underlying {@link DataService}.
*/ */
public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_HANDOVER = 3; public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_HANDOVER = 2;
/** /**
* Do not perform fallback to the source transport on data handover failure. * Do not perform fallback to the source transport on data handover failure.
* Frameworks should retry setup a new data connection by sending * Framework will retry setting up a new data connection by sending
* {@link DataService#REQUEST_REASON_NORMAL} request to the underlying {@link DataService}. * {@link DataService#REQUEST_REASON_NORMAL} request to the underlying {@link DataService}.
*/ */
public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL = 4; public static final int HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL = 3;
private final @DataFailureCause int mCause; private final @DataFailureCause int mCause;
private final int mSuggestedRetryTime; private final int mSuggestedRetryTime;
@@ -332,6 +332,7 @@ public final class DataCallResponse implements Parcelable {
.append(" mtu=").append(getMtu()) .append(" mtu=").append(getMtu())
.append(" mtuV4=").append(getMtuV4()) .append(" mtuV4=").append(getMtuV4())
.append(" mtuV6=").append(getMtuV6()) .append(" mtuV6=").append(getMtuV6())
.append(" handoverFailureMode=").append(getHandoverFailureMode())
.append("}"); .append("}");
return sb.toString(); return sb.toString();
} }
@@ -361,14 +362,15 @@ public final class DataCallResponse implements Parcelable {
&& mPcscfAddresses.containsAll(other.mPcscfAddresses) && mPcscfAddresses.containsAll(other.mPcscfAddresses)
&& mMtu == other.mMtu && mMtu == other.mMtu
&& mMtuV4 == other.mMtuV4 && mMtuV4 == other.mMtuV4
&& mMtuV6 == other.mMtuV6; && mMtuV6 == other.mMtuV6
&& mHandoverFailureMode == other.mHandoverFailureMode;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(mCause, mSuggestedRetryTime, mId, mLinkStatus, mProtocolType, return Objects.hash(mCause, mSuggestedRetryTime, mId, mLinkStatus, mProtocolType,
mInterfaceName, mAddresses, mDnsAddresses, mGatewayAddresses, mPcscfAddresses, mInterfaceName, mAddresses, mDnsAddresses, mGatewayAddresses, mPcscfAddresses,
mMtu, mMtuV4, mMtuV6); mMtu, mMtuV4, mMtuV6, mHandoverFailureMode);
} }
@Override @Override