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

Merge "[RCS UCE] Modify the data type of parameter retryAfter from String to long" am: 7a964f2199 am: 3a435016f4

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

Change-Id: I2bbc5ab8063fb2e79aeffec5e5d2eea168f70b2c
This commit is contained in:
James Lin
2020-12-02 16:15:55 +00:00
committed by Automerger Merge Worker
parent 1592b52b91 3a435016f4
commit da5488d282
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/ims/aidl/ISubscribeResponseCallback.aidl
View File

@@ -32,5 +32,5 @@ oneway interface ISubscribeResponseCallback {
void onNetworkResponse(int code, in String reason); void onNetworkResponse(int code, in String reason);
void onNotifyCapabilitiesUpdate(in List<String> pidfXmls); void onNotifyCapabilitiesUpdate(in List<String> pidfXmls);
void onResourceTerminated(in List<RcsContactTerminatedReason> uriTerminatedReason); void onResourceTerminated(in List<RcsContactTerminatedReason> uriTerminatedReason);
void onTerminated(in String reason, in String retryAfter); void onTerminated(in String reason, long retryAfterMilliseconds);
} }

4
telephony/java/android/telephony/ims/aidl/RcsSubscribeResponseAidlWrapper.java
View File

@@ -86,9 +86,9 @@ public class RcsSubscribeResponseAidlWrapper implements SubscribeResponseCallbac
} }
@Override @Override
public void onTerminated(String reason, String retryAfter) throws ImsException { public void onTerminated(String reason, long retryAfterMilliseconds) throws ImsException {
try { try {
mResponseBinder.onTerminated(reason, retryAfter); mResponseBinder.onTerminated(reason, retryAfterMilliseconds);
} catch (RemoteException e) { } catch (RemoteException e) {
} }
} }

2
telephony/java/android/telephony/ims/stub/RcsCapabilityExchangeImplBase.java
View File

@@ -250,7 +250,7 @@ public class RcsCapabilityExchangeImplBase {
* This allows the framework to know that there will no longer be any * This allows the framework to know that there will no longer be any
* capability updates for the requested operationToken. * capability updates for the requested operationToken.
*/ */
void onTerminated(String reason, String retryAfter) throws ImsException; void onTerminated(String reason, long retryAfterMilliseconds) throws ImsException;
} }