commit 4dea6754b5a4ceb3c4c700b86e3947d82f6f4c7e
author Tyler Gunn <tgunn@google.com> Mon Jun 22 15:30:46 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 15:30:46 2020 +0000
tree 70e5a05237221a0047f27dc1e334078330f55a2c
parent 6ae634c85053f09c4bb1887122a6c5cc3be579ce
parent 8faaad76344ee8d0798c32f6c4befe2816d2013e

Merge "Add missing SCREENING_BOUND/COMPLETED telecom event logs." into rvc-dev am: 920b2aeccd am: 8faaad7634

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/11897364

Change-Id: I687db904363fc8da048878df4a27e3950ae67e1d

src/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java

diff --git a/src/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java b/src/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
index 51608a0..1e52c5a 100644
--- a/src/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
+++ b/src/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
@@ -34,6 +34,7 @@
 import com.android.server.telecom.Call;
 import com.android.server.telecom.CallScreeningServiceHelper;
 import com.android.server.telecom.CallsManager;
+import com.android.server.telecom.LogUtils;
 import com.android.server.telecom.ParcelableCallUtils;
 
 import java.util.concurrent.CompletableFuture;
@@ -70,6 +71,7 @@
                 if (mCall == null || (!mCall.getId().equals(callId))) {
                     Log.w(this, "allowCall, unknown call id: %s", callId);
                 }
+                Log.addEvent(mCall, LogUtils.Events.SCREENING_COMPLETED, mPriorStageResult);
                 mResultFuture.complete(mPriorStageResult);
             } finally {
                 unbindCallScreeningService();
@@ -86,7 +88,7 @@
             Log.startSession("NCSSF.dC");
             try {
                 if (mCall != null && mCall.getId().equals(callId)) {
-                    mResultFuture.complete(new CallFilteringResult.Builder()
+                    CallFilteringResult result = new CallFilteringResult.Builder()
                             .setShouldAllowCall(false)
                             .setShouldReject(shouldReject)
                             .setShouldSilence(false)
@@ -97,7 +99,9 @@
                             .setCallScreeningAppName(mAppName)
                             .setCallScreeningComponentName(componentName.flattenToString())
                             .setContactExists(mPriorStageResult.contactExists)
-                            .build());
+                            .build();
+                    Log.addEvent(mCall, LogUtils.Events.SCREENING_COMPLETED, result);
+                    mResultFuture.complete(result);
                 } else {
                     Log.w(this, "disallowCall, unknown call id: %s", callId);
                     mResultFuture.complete(mPriorStageResult);
@@ -115,14 +119,16 @@
             Log.startSession("NCSSF.sC");
             try {
                 if (mCall != null && mCall.getId().equals(callId)) {
-                    mResultFuture.complete(new CallFilteringResult.Builder()
+                    CallFilteringResult result = new CallFilteringResult.Builder()
                             .setShouldAllowCall(true)
                             .setShouldReject(false)
                             .setShouldSilence(true)
                             .setShouldAddToCallLog(true)
                             .setShouldShowNotification(true)
                             .setContactExists(mPriorStageResult.contactExists)
-                            .build());
+                            .build();
+                    Log.addEvent(mCall, LogUtils.Events.SCREENING_COMPLETED, result);
+                    mResultFuture.complete(result);
                 } else {
                     Log.w(this, "silenceCall, unknown call id: %s", callId);
                     mResultFuture.complete(mPriorStageResult);
@@ -146,14 +152,16 @@
 
             try {
                 if (mCall != null && mCall.getId().equals(callId)) {
-                    mResultFuture.complete(new CallFilteringResult.Builder()
+                    CallFilteringResult result = new CallFilteringResult.Builder()
                             .setShouldAllowCall(true)
                             .setShouldReject(false)
                             .setShouldSilence(false)
                             .setShouldScreenViaAudio(true)
                             .setCallScreeningAppName(mAppName)
                             .setContactExists(mPriorStageResult.contactExists)
-                            .build());
+                            .build();
+                    Log.addEvent(mCall, LogUtils.Events.SCREENING_COMPLETED, result);
+                    mResultFuture.complete(result);
                 } else {
                     Log.w(this, "screenCallFurther, unknown call id: %s", callId);
                     mResultFuture.complete(mPriorStageResult);
@@ -185,6 +193,7 @@
                 Log.e(this, e, "Failed to set the call screening adapter");
                 mResultFuture.complete(mPriorStageResult);
             }
+            Log.addEvent(mCall, LogUtils.Events.SCREENING_BOUND, componentName);
             Log.i(this, "Binding completed.");
         }