commit 6876d90ec0135363e45e6d8eac76cdc66e9af663
author Thomas Stuart <tjstuart@google.com> Thu Sep 28 21:35:03 2023 +0000
committer Thomas Stuart <tjstuart@google.com> Thu Sep 28 21:35:36 2023 +0000
tree fa51ef5984f4b8156818f29e6e4cdee5a50f3bc3
parent 76bf86a5a06ba553636baf7a33059b6352336118

Revert "Gen. anamoly report when Telecom & Telephony default out are diff"

This reverts commit 76bf86a5a06ba553636baf7a33059b6352336118.

Reason for revert: generating false-positive reports

Bug: 298203009
Change-Id: I8bf1f1f015c1ebdd7ff23923ca9f64a81c3234ba

src/com/android/server/telecom/CallsManager.java

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 330a7a5..abf3478 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -295,10 +295,6 @@
             UUID.fromString("2e994acb-1997-4345-8bf3-bad04303de26");
     public static final String EMERGENCY_CALL_ABORTED_NO_PHONE_ACCOUNTS_ERROR_MSG =
             "An emergency call was aborted since there were no available phone accounts.";
-    public static final UUID DEFAULT_CALLING_ACCOUNT_MISMATCH_UUID =
-            UUID.fromString("64b6d6b0-3c7c-11ee-be56-0242ac120002");
-    public static final String DEFAULT_CALLING_ACCOUNT_MISMATCH_MSG =
-            "Telecom and Telephony have different default calling accounts.";
 
     private static final int[] OUTGOING_CALL_STATES =
             {CallState.CONNECTING, CallState.SELECT_PHONE_ACCOUNT, CallState.DIALING,
@@ -2196,33 +2192,9 @@
                     }
                     return CompletableFuture.completedFuture(callToUse);
                 }, new LoggedHandlerExecutor(outgoingCallHandler, "CM.pASP", mLock));
-        maybeGenAnomReportForDefaultMismatch(initiatingUser);
         return mLatestPostSelectionProcessingFuture;
     }
 
-    /**
-     * If the Telecom default outgoing account ID is not the same as the Telephony voice sub ID,
-     * this can cause unwanted behavior.
-     */
-    private void maybeGenAnomReportForDefaultMismatch(UserHandle userHandle) {
-        try {
-            PhoneAccountHandle handle =
-                    mPhoneAccountRegistrar.getUserSelectedOutgoingPhoneAccount(userHandle);
-            int currentTelecomId = -1;
-            if (handle != null) {
-                currentTelecomId = Integer.parseInt(handle.getId());
-            }
-            int currentVoiceSubId = SubscriptionManager.getDefaultVoiceSubscriptionId();
-            if (currentTelecomId != currentVoiceSubId) {
-                mAnomalyReporter.reportAnomaly(
-                        DEFAULT_CALLING_ACCOUNT_MISMATCH_UUID,
-                        DEFAULT_CALLING_ACCOUNT_MISMATCH_MSG);
-            }
-        } catch (Exception e) {
-            // ignore exceptions.  This should not affect the outgoing call.
-        }
-    }
-
     private static int getManagedProfileUserId(Context context, int userId) {
         UserManager um = context.getSystemService(UserManager.class);
         List<UserInfo> userProfiles = um.getProfiles(userId);