Merge "Add a trace instant containing the response to a RIL request." into main (293ccc2d) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/RIL.java

+16 −7

Original line number	Diff line number	Diff line
		@@ -1179,7 +1179,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
		private void addRequest(RILRequest rr) {
		acquireWakeLock(rr, FOR_WAKELOCK);
		Trace.asyncTraceForTrackBegin(
		Trace.TRACE_TAG_NETWORK, "RIL", RILUtils.requestToString(rr.mRequest), rr.mSerial);
		Trace.TRACE_TAG_NETWORK, "RIL", rr.mSerial + "> "
		+ RILUtils.requestToString(rr.mRequest), rr.mSerial);
		synchronized (mRequestList) {
		rr.mStartTimeMs = SystemClock.elapsedRealtime();
		mRequestList.append(rr.mSerial, rr);
		@@ -5404,14 +5405,22 @@ public class RIL extends BaseCommands implements CommandsInterface {
		private void processResponseDoneInternal(RILRequest rr, int rilError, int responseType,
		Object ret) {
		if (rilError == 0) {
		if (isLogOrTrace()) {
		String logStr = rr.serialString() + "< " + RILUtils.requestToString(rr.mRequest)
		+ " " + retToString(rr.mRequest, ret);
		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "< " + RILUtils.requestToString(rr.mRequest)
		+ " " + retToString(rr.mRequest, ret));
		riljLog(logStr);
		}
		Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);
		}
		} else {
		if (isLogOrTrace()) {
		String logStr = rr.serialString() + "< " + RILUtils.requestToString(rr.mRequest)
		+ " error " + rilError;
		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "< " + RILUtils.requestToString(rr.mRequest)
		+ " error " + rilError);
		riljLog(logStr);
		}
		Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);
		}
		rr.onError(rilError, ret);
		}