From d079881059bebc547ce92c3b242a9e06ca315871 Mon Sep 17 00:00:00 2001 From: "James.cf Lin" Date: Mon, 30 Nov 2020 00:56:32 +0800 Subject: [PATCH] [RCS UCE] Modify the data type of parameter retryAfter from String to long The data type long to indicate that how long the request can be retried again. Bug: 173175176 Test: build pass Change-Id: I22275e8259950a3efd247b3c906392a41d0ca2f1 --- .../telephony/ims/aidl/ISubscribeResponseCallback.aidl | 2 +- .../telephony/ims/aidl/RcsSubscribeResponseAidlWrapper.java | 4 ++-- .../telephony/ims/stub/RcsCapabilityExchangeImplBase.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/telephony/java/android/telephony/ims/aidl/ISubscribeResponseCallback.aidl b/telephony/java/android/telephony/ims/aidl/ISubscribeResponseCallback.aidl index 4deaba1b7a498..a14199365b072 100644 --- a/telephony/java/android/telephony/ims/aidl/ISubscribeResponseCallback.aidl +++ b/telephony/java/android/telephony/ims/aidl/ISubscribeResponseCallback.aidl @@ -32,5 +32,5 @@ oneway interface ISubscribeResponseCallback { void onNetworkResponse(int code, in String reason); void onNotifyCapabilitiesUpdate(in List pidfXmls); void onResourceTerminated(in List uriTerminatedReason); - void onTerminated(in String reason, in String retryAfter); + void onTerminated(in String reason, long retryAfterMilliseconds); } diff --git a/telephony/java/android/telephony/ims/aidl/RcsSubscribeResponseAidlWrapper.java b/telephony/java/android/telephony/ims/aidl/RcsSubscribeResponseAidlWrapper.java index 37588ed98585d..1fb339c0cf89f 100644 --- a/telephony/java/android/telephony/ims/aidl/RcsSubscribeResponseAidlWrapper.java +++ b/telephony/java/android/telephony/ims/aidl/RcsSubscribeResponseAidlWrapper.java @@ -86,9 +86,9 @@ public class RcsSubscribeResponseAidlWrapper implements SubscribeResponseCallbac } @Override - public void onTerminated(String reason, String retryAfter) throws ImsException { + public void onTerminated(String reason, long retryAfterMilliseconds) throws ImsException { try { - mResponseBinder.onTerminated(reason, retryAfter); + mResponseBinder.onTerminated(reason, retryAfterMilliseconds); } catch (RemoteException e) { } } diff --git a/telephony/java/android/telephony/ims/stub/RcsCapabilityExchangeImplBase.java b/telephony/java/android/telephony/ims/stub/RcsCapabilityExchangeImplBase.java index b5704bfb3569c..3a0fb6edb2fb7 100644 --- a/telephony/java/android/telephony/ims/stub/RcsCapabilityExchangeImplBase.java +++ b/telephony/java/android/telephony/ims/stub/RcsCapabilityExchangeImplBase.java @@ -250,7 +250,7 @@ public class RcsCapabilityExchangeImplBase { * This allows the framework to know that there will no longer be any * capability updates for the requested operationToken. */ - void onTerminated(String reason, String retryAfter) throws ImsException; + void onTerminated(String reason, long retryAfterMilliseconds) throws ImsException; }