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

Commit 5ebf64cb authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Remove use of internal Trace method. 

android.os.Trace is not a proper API; remove use of these references from
Telecom to remove references to hidden APIs.

The delta looks strange because I had to remove the try/finally and that
made the indentation change.

Fixes: 307786578
Test: Compile; run unit/cts tests.
Flag: EXEMPT bugfix; removes non-impacting code.
Change-Id: Ib31a47a71efaba62905cd18336967d2890b1e177
parent 28786e78

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

+0 −4
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.os.OutcomeReceiver; 
import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.Trace;

import android.os.UserHandle;

import android.provider.CallLog;

import android.provider.ContactsContract.Contacts;
@@ -3858,7 +3857,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
     * @param callerInfo The new caller information to set.

     */

    private void setCallerInfo(Uri handle, CallerInfo callerInfo) {

        Trace.beginSection("setCallerInfo");

        if (callerInfo == null) {

            Log.i(this, "CallerInfo lookup returned null, skipping update");

            return;
@@ -3882,8 +3880,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
                l.onCallerInfoChanged(this);

            }

        }



        Trace.endSection();

    }



    public CallerInfo getCallerInfo() {

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

+26 −32
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.media.AudioFocusRequest; 
import android.media.AudioManager;

import android.os.Looper;

import android.os.Message;

import android.os.Trace;

import android.telecom.Log;

import android.telecom.Logging.Runnable;

import android.telecom.Logging.Session;
@@ -461,8 +460,6 @@ public class CallAudioModeStateMachine extends StateMachine { 
        private boolean mHasFocus = false;



        private void tryStartRinging() {

            Trace.traceBegin(Trace.TRACE_TAG_AUDIO, "CallAudioMode.tryStartRinging");

            try {

            if (mHasFocus && mCallAudioManager.isRingtonePlaying()) {

                Log.i(LOG_TAG,

                    "RingingFocusState#tryStartRinging -- audio focus previously"
@@ -493,9 +490,6 @@ public class CallAudioModeStateMachine extends StateMachine { 
                Log.i(

                    LOG_TAG, "RINGING state, try start ringing but not acquiring audio focus");

            }

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_AUDIO);

            }

        }



        @Override

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

+0 −3
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ import android.content.pm.ResolveInfo; 
import android.net.Uri;

import android.os.Bundle;

import android.os.Looper;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.telecom.DefaultDialerManager;
@@ -95,14 +94,12 @@ public class CallIntentProcessor { 
        final boolean isUnknownCall = intent.getBooleanExtra(KEY_IS_UNKNOWN_CALL, false);

        Log.i(this, "onReceive - isUnknownCall: %s", isUnknownCall);



        Trace.beginSection("processNewCallCallIntent");

        if (isUnknownCall) {

            processUnknownCallIntent(mCallsManager, intent);

        } else {

            processOutgoingCallIntent(mContext, mCallsManager, intent, callingPackage,

                    mDefaultDialerCache, mFeatureFlags);

        }

        Trace.endSection();

    }

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

+0 −35
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ import android.os.ResultReceiver; 
import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.SystemVibrator;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.BlockedNumberContract;
@@ -4621,7 +4620,6 @@ public class CallsManager extends Call.ListenerBase 
            Log.i(this, "addCall(%s) is already added");

            return;

        }

        Trace.beginSection("addCall");

        Log.i(this, "addCall(%s)", call);

        call.addListener(this);

        mCalls.add(call);
@@ -4638,20 +4636,12 @@ public class CallsManager extends Call.ListenerBase 
        updateExternalCallCanPullSupport();

        // onCallAdded for calls which immediately take the foreground (like the first call).

        for (CallsManagerListener listener : mListeners) {

            if (LogUtils.SYSTRACE_DEBUG) {

                Trace.beginSection(listener.getClass().toString() + " addCall");

            }

            listener.onCallAdded(call);

            if (LogUtils.SYSTRACE_DEBUG) {

                Trace.endSection();

            }

        }

        Trace.endSection();

    }



    @VisibleForTesting

    public void removeCall(Call call) {

        Trace.beginSection("removeCall");

        Log.v(this, "removeCall(%s)", call);



        if (call.isTransactionalCall() && call.getTransactionServiceWrapper() != null) {
@@ -4678,17 +4668,10 @@ public class CallsManager extends Call.ListenerBase 
            updateCanAddCall();

            updateHasActiveRttCall();

            for (CallsManagerListener listener : mListeners) {

                if (LogUtils.SYSTRACE_DEBUG) {

                    Trace.beginSection(listener.getClass().toString() + " onCallRemoved");

                }

                listener.onCallRemoved(call);

                if (LogUtils.SYSTRACE_DEBUG) {

                    Trace.endSection();

            }

        }

    }

        Trace.endSection();

    }



    private void updateHasActiveRttCall() {

        boolean hasActiveRttCall = hasActiveRttCall();
@@ -4750,13 +4733,8 @@ public class CallsManager extends Call.ListenerBase 
                call.getAnalytics().setMissedReason(call.getMissedReason());



                maybeShowErrorDialogOnDisconnect(call);



                Trace.beginSection("onCallStateChanged");



                maybeHandleHandover(call, newState);

                notifyCallStateChanged(call, oldState, newState);



                Trace.endSection();

            } else {

                Log.i(this, "failed in setting the state to new state");

            }
@@ -4769,14 +4747,7 @@ public class CallsManager extends Call.ListenerBase 
            updateCanAddCall();

            updateHasActiveRttCall();

            for (CallsManagerListener listener : mListeners) {

                if (LogUtils.SYSTRACE_DEBUG) {

                    Trace.beginSection(listener.getClass().toString() +

                            " onCallStateChanged");

                }

                listener.onCallStateChanged(call, oldState, newState);

                if (LogUtils.SYSTRACE_DEBUG) {

                    Trace.endSection();

                }

            }

        }

    }
@@ -4901,13 +4872,7 @@ public class CallsManager extends Call.ListenerBase 
        if (newCanAddCall != mCanAddCall) {

            mCanAddCall = newCanAddCall;

            for (CallsManagerListener listener : mListeners) {

                if (LogUtils.SYSTRACE_DEBUG) {

                    Trace.beginSection(listener.getClass().toString() + " updateCanAddCall");

                }

                listener.onCanAddCallChanged(mCanAddCall);

                if (LogUtils.SYSTRACE_DEBUG) {

                    Trace.endSection();

                }

            }

        }

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import android.os.IBinder; 
import android.os.Looper;

import android.os.PackageTagsList;

import android.os.RemoteException;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.telecom.CallAudioState;
@@ -2573,7 +2572,6 @@ public class InCallController extends CallsManagerListenerBase implements 
            Log.e(this, e, "Failed to set the in-call adapter.");

            mAnomalyReporter.reportAnomaly(SET_IN_CALL_ADAPTER_ERROR_UUID,

                    SET_IN_CALL_ADAPTER_ERROR_MSG);

            Trace.endSection();

            return false;

        }