diff options
author | Hakjun Choi <hakjunc@google.com> | 2021-11-25 01:05:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-11-25 01:05:22 +0000 |
commit | af94eeb0a2e2d2835281f7e9d31a684e8d50d781 (patch) | |
tree | 400819c1ad0d554d77b5a4e707e4b216251fe803 /src/java/com/android/ims/rcs/uce/request/OptionsRequestCoordinator.java | |
parent | b6cf253315e975af81f9f874943dd1abf9dd1430 (diff) | |
parent | be5550dc2f7afb5aa732f1cf8238890924ed873e (diff) | |
download | ims-android12L-dev.tar.gz |
Merge changes from topic "RCS single registration metrics" into sc-v2-devandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-release
* changes:
Add metrics for UCE event about Publish, Subscribe, Options and metrics for RCS registration features
[UCE] Reset the retry count and times related publish when the publish status changed to not_published
Create UceStatsWriter for RCS metrics
Diffstat (limited to 'src/java/com/android/ims/rcs/uce/request/OptionsRequestCoordinator.java')
-rw-r--r-- | src/java/com/android/ims/rcs/uce/request/OptionsRequestCoordinator.java | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/java/com/android/ims/rcs/uce/request/OptionsRequestCoordinator.java b/src/java/com/android/ims/rcs/uce/request/OptionsRequestCoordinator.java index a150dd6d..a2660931 100644 --- a/src/java/com/android/ims/rcs/uce/request/OptionsRequestCoordinator.java +++ b/src/java/com/android/ims/rcs/uce/request/OptionsRequestCoordinator.java @@ -24,6 +24,7 @@ import android.telephony.ims.RcsUceAdapter; import android.telephony.ims.aidl.IRcsUceControllerCallback; import com.android.ims.rcs.uce.request.UceRequestManager.RequestManagerCallback; +import com.android.ims.rcs.uce.UceStatsWriter; import com.android.internal.annotations.VisibleForTesting; import java.util.Collection; @@ -44,7 +45,14 @@ public class OptionsRequestCoordinator extends UceRequestCoordinator { public Builder(int subId, Collection<UceRequest> requests, RequestManagerCallback callback) { - mRequestCoordinator = new OptionsRequestCoordinator(subId, requests, callback); + mRequestCoordinator = new OptionsRequestCoordinator(subId, requests, callback, + UceStatsWriter.getInstance()); + } + @VisibleForTesting + public Builder(int subId, Collection<UceRequest> requests, + RequestManagerCallback callback, UceStatsWriter instance) { + mRequestCoordinator = new OptionsRequestCoordinator(subId, requests, callback, + instance); } public Builder setCapabilitiesCallback(IRcsUceControllerCallback callback) { @@ -105,9 +113,12 @@ public class OptionsRequestCoordinator extends UceRequestCoordinator { // The callback to notify the result of the capabilities request. private IRcsUceControllerCallback mCapabilitiesCallback; + private final UceStatsWriter mUceStatsWriter; + private OptionsRequestCoordinator(int subId, Collection<UceRequest> requests, - RequestManagerCallback requestMgrCallback) { + RequestManagerCallback requestMgrCallback, UceStatsWriter instance) { super(subId, requests, requestMgrCallback); + mUceStatsWriter = instance; logd("OptionsRequestCoordinator: created"); } @@ -189,6 +200,11 @@ public class OptionsRequestCoordinator extends UceRequestCoordinator { // Finish this request. request.onFinish(); + int commandErrorCode = response.getCommandError().orElse(0); + mUceStatsWriter.setUceEvent(mSubId, UceStatsWriter.OUTGOING_OPTION_EVENT, + false, commandErrorCode, 0); + + // Remove this request from the activated collection and notify RequestManager. Long taskId = request.getTaskId(); RequestResult requestResult = sCommandErrorCreator.createRequestResult(taskId, response); @@ -203,6 +219,11 @@ public class OptionsRequestCoordinator extends UceRequestCoordinator { CapabilityRequestResponse response = request.getRequestResponse(); logd("handleNetworkResponse: " + response.toString()); + int responseCode = response.getNetworkRespSipCode().orElse(0); + mUceStatsWriter.setUceEvent(mSubId, UceStatsWriter.OUTGOING_OPTION_EVENT, true, + 0, responseCode); + + List<RcsContactUceCapability> updatedCapList = response.getUpdatedContactCapability(); if (!updatedCapList.isEmpty()) { // Save the capabilities and trigger the capabilities callback |