Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b334230 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "rm genAnomReportOnFocusTimeout flag for cleanup purposes" into main

parents 99bf4b23 00b778da

flags/telecom_anomaly_report_flags.aconfig

+0 −8
Original line number Diff line number Diff line 
package: "com.android.server.telecom.flags"

container: "system"



# OWNER=tjstuart TARGET=24Q3

flag {

  name: "gen_anom_report_on_focus_timeout"

  namespace: "telecom"

  description: "When getCurrentFocusCall times out, generate an anom. report"

  bug: "309541253"

}



# OWNER=tjstuart TARGET=25Q2

flag {

  name: "disconnect_self_managed_stuck_startup_calls"

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

+0 −4
Original line number Diff line number Diff line
@@ -3350,10 +3350,6 @@ public class CallsManager extends Call.ListenerBase 
            // from the client via a transaction before answering.

            call.answer(videoState);

        } else {

            if (!mFeatureFlags.genAnomReportOnFocusTimeout()) {

                Call activeCall = (Call) mConnectionSvrFocusMgr.getCurrentFocusCall();

                Log.d(this, "answerCall: Incoming call = %s Ongoing call %s", call, activeCall);

            }

            // Hold or disconnect the active call and request call focus for the incoming call.

            holdActiveCallForNewCall(call);

            mConnectionSvrFocusMgr.requestFocus(

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

+12 −18
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.util.LogPrinter; 
import android.util.Printer;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.telecom.flags.Flags;

import com.android.internal.util.IndentingPrintWriter;



import java.util.ArrayList;
@@ -341,7 +340,6 @@ public class ConnectionServiceFocusManager { 
            if (syncCallFocus != null) {

                return syncCallFocus.orElse(null);

            } else {

                if (Flags.genAnomReportOnFocusTimeout()) {

                Log.w(TAG, "Timed out waiting for synchronous current focus. Returning possibly"

                                + " inaccurate result. returning currentFocusCall=[%s]",

                        mCurrentFocusCall);
@@ -354,10 +352,6 @@ public class ConnectionServiceFocusManager { 
                mAnomalyReporter.reportAnomaly(

                        WATCHDOG_GET_CALL_FOCUS_TIMEOUT_UUID,

                        WATCHDOG_GET_CALL_FOCUS_TIMEOUT_MSG);

                } else {

                    Log.w(TAG, "Timed out waiting for synchronous current focus. Returning possibly"

                            + " inaccurate result");

                }

                return mCurrentFocusCall;

            }

        } catch (InterruptedException e) {