Merge "Remove use of internal Trace method." into main (01be7c57) · Commits · e / os / android_packages_services_Telecomm

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;
		@@ -3863,7 +3862,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;
		@@ -3887,8 +3885,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;
		@@ -4629,7 +4628,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);
		@@ -4646,20 +4644,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) {
		@@ -4686,17 +4676,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();
		@@ -4758,13 +4741,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");
		}
		@@ -4777,14 +4755,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();
		}
		}
		}
		}
		@@ -4909,13 +4880,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;
		}