Merge "Revert the API behavior"

2020-11-04 01:52:10 +00:00
parent b4e9dc0a28 258add92ce
commit a641c7dc2d
1 changed files with 6 additions and 0 deletions
--- a/telephony/java/android/telephony/data/DataCallResponse.java
+++ b/telephony/java/android/telephony/data/DataCallResponse.java
@@ -240,6 +240,12 @@ public final class DataCallResponse implements Parcelable {
     */
    @Deprecated
    public int getSuggestedRetryTime() {
+        // To match the pre-deprecated getSuggestedRetryTime() behavior.
+        if (mSuggestedRetryTime == RETRY_INTERVAL_UNDEFINED) {
+            return 0;
+        } else if (mSuggestedRetryTime > Integer.MAX_VALUE) {
+            return Integer.MAX_VALUE;
+        }
        return (int) mSuggestedRetryTime;
    }