am 592359ae: Catch nulls in the new logging code. (8f03efc9) · Commits · e / os / android_frameworks_opt_telephony

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

+11 −9

Original line number	Diff line number	Diff line
		@@ -441,7 +441,7 @@ public class DctController extends Handler {
		private int releaseNetwork(NetworkRequest request) {
		RequestInfo requestInfo = mRequestInfos.get(request.requestId);
		logd("releaseNetwork request=" + request + ", requestInfo=" + requestInfo);
		requestInfo.log("DctController.releaseNetwork");
		if (requestInfo != null) requestInfo.log("DctController.releaseNetwork");

		final int serialNum = trackNetworkRelease(requestInfo);
		mRequestInfos.remove(request.requestId);
		@@ -541,8 +541,9 @@ public class DctController extends Handler {

		private void onReleaseRequest(RequestInfo requestInfo, int executionSerialNumber) {
		logd("onReleaseRequest request=" + requestInfo);
		if (requestInfo != null) {
		requestInfo.log("DctController.onReleaseRequest");
		if (requestInfo != null && requestInfo.executed) {
		if (requestInfo.executed) {
		String apn = apnForNetworkRequest(requestInfo.request);
		int phoneId = getRequestPhoneId(requestInfo.request);
		PhoneBase phoneBase = (PhoneBase)mPhones[phoneId].getActivePhone();
		@@ -551,6 +552,7 @@ public class DctController extends Handler {
		requestInfo.executed = false;
		}
		}
		}

		private void onReleaseAllRequests(int phoneId) {
		logd("onReleaseAllRequests phoneId=" + phoneId);