From 258add92ce7dd6933b564de2aa9b9a360b95564d Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Tue, 3 Nov 2020 14:48:23 -0800
Subject: [PATCH] Revert the API behavior

getSuggestedRetryTime should return 0 when suggested retry
time is not set. This is to match the behavior prior ag/12913222

Fix: 172313389
Test: Manual
Change-Id: Ie06f2343b21caef252e981b734dd57139e66cbad
---
 telephony/java/android/telephony/data/DataCallResponse.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/telephony/java/android/telephony/data/DataCallResponse.java b/telephony/java/android/telephony/data/DataCallResponse.java
index 3e2a6eec37c47..b054dfcab2b6a 100644
--- 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;
     }