Improve QosCallbackTracker logging to simplify debugging am: 3582ad5a5e am: 564326a581 (66f199ba) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ public class DcNetworkAgent extends NetworkAgent {

		public final DcKeepaliveTracker keepaliveTracker = new DcKeepaliveTracker();

		private final QosCallbackTracker mQosCallbackTracker = new QosCallbackTracker(this);
		private final QosCallbackTracker mQosCallbackTracker;

		private final Executor mQosCallbackExecutor = Executors.newSingleThreadExecutor();

		@@ -119,6 +119,7 @@ public class DcNetworkAgent extends NetworkAgent {
		} else {
		loge("The connection does not have a valid link properties.");
		}
		mQosCallbackTracker = new QosCallbackTracker(this);
		}

		private @NetworkType int getNetworkType() {

+6 −2

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ import java.util.Map;
		* {@hide}
		*/
		public class QosCallbackTracker {
		private static final String LOG_TAG = QosCallbackTracker.class.getSimpleName();
		@NonNull private final String mTag;
		@NonNull private final DcNetworkAgent mDcNetworkAgent;
		@NonNull private final Map<Integer, QosBearerSession> mQosBearerSessions;

		@@ -59,6 +59,7 @@ public class QosCallbackTracker {
		mQosBearerSessions = new HashMap<>();
		mCallbacksToFilter = new HashMap<>();
		mDcNetworkAgent = dcNetworkAgent;
		mTag = "QosCallbackTracker" + "-" + mDcNetworkAgent.getNetwork().getNetId();
		}

		/**
		@@ -256,12 +257,15 @@ public class QosCallbackTracker {
		mDcNetworkAgent.notifyQosSessionAvailable(
		callbackId, session.getQosBearerSessionId(), nrQosAttr);
		}

		logd("sendSessionAvailable, callbackId=" + callbackId);
		}

		private void sendSessionLost(final int callbackId, @NonNull final QosBearerSession session) {
		mDcNetworkAgent.notifyQosSessionLost(callbackId, session.getQosBearerSessionId(),
		session.getQos() instanceof EpsQos ?
		QosSession.TYPE_EPS_BEARER : QosSession.TYPE_NR_BEARER);
		logd("sendSessionLost, callbackId=" + callbackId);
		}

		public interface IFilter {
		@@ -275,6 +279,6 @@ public class QosCallbackTracker {
		* @param s is string log
		*/
		private void logd(String s) {
		Rlog.d(LOG_TAG, s);
		Rlog.d(mTag, s);
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
		import static org.mockito.Mockito.anyInt;
		import static org.mockito.Mockito.any;
		import static org.mockito.Mockito.doNothing;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.eq;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.never;
		@@ -94,12 +95,16 @@ public class QosCallbackTrackerTest extends TelephonyTest {

		@Mock
		private DcNetworkAgent mDcNetworkAgent;
		@Mock
		private Network mNetwork;

		private QosCallbackTracker mQosCallbackTracker;

		@Before
		public void setUp() throws Exception {
		super.setUp(getClass().getSimpleName());
		doReturn(mNetwork).when(mDcNetworkAgent).getNetwork();
		doReturn(100).when(mNetwork).getNetId();
		mQosCallbackTracker = new QosCallbackTracker(mDcNetworkAgent);
		processAllMessages();
		}