DO NOT MERGE - Remove DctController (7689ce94) · Commits · e / os / android_frameworks_opt_telephony

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

+11 −17

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.telephony.TelephonyManager;
		import android.util.LocalLog;

		import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;
		import com.android.internal.telephony.dataconnection.DctController;
		import com.android.internal.telephony.dataconnection.TelephonyNetworkFactory;
		import com.android.internal.telephony.imsphone.ImsPhone;
		import com.android.internal.telephony.imsphone.ImsPhoneFactory;
		@@ -216,18 +215,19 @@ public class PhoneFactory {
		SubscriptionMonitor subscriptionMonitor = new SubscriptionMonitor(tr,
		sContext, sc, numPhones);

		//sPhoneSwitcher = new PhoneSwitcher(MAX_ACTIVE_PHONES, numPhones,
		// sContext, sc, Looper.myLooper(), tr, sCommandsInterfaces,
		// sPhones);
		sPhoneSwitcher = new PhoneSwitcher(MAX_ACTIVE_PHONES, numPhones,
		sContext, sc, Looper.myLooper(), tr, sCommandsInterfaces,
		sPhones);

		sProxyController = ProxyController.getInstance(context, sPhones,
		sUiccController, sCommandsInterfaces, sPhoneSwitcher);

		//for (int i = 0; i < numPhones; i++) {
		// sTelephonyNetworkFactories[i] = new TelephonyNetworkFactory(
		// sPhoneSwitcher, sc, subscriptionMonitor, Looper.myLooper(),
		// sContext, i, sPhones[i].mDcTracker);
		//}
		sTelephonyNetworkFactories = new TelephonyNetworkFactory[numPhones];
		for (int i = 0; i < numPhones; i++) {
		sTelephonyNetworkFactories[i] = new TelephonyNetworkFactory(
		sPhoneSwitcher, sc, subscriptionMonitor, Looper.myLooper(),
		sContext, i, sPhones[i].mDcTracker);
		}
		}
		}
		}
		@@ -474,8 +474,8 @@ public class PhoneFactory {
		pw.println("PhoneFactory:");
		pw.println(" sMadeDefaults=" + sMadeDefaults);

		//sPhoneSwitcher.dump(fd, pw, args);
		//pw.println();
		sPhoneSwitcher.dump(fd, pw, args);
		pw.println();

		Phone[] phones = (Phone[])PhoneFactory.getPhones();
		for (int i = 0; i < phones.length; i++) {
		@@ -505,12 +505,6 @@ public class PhoneFactory {
		pw.println("++++++++++++++++++++++++++++++++");
		}

		try {
		DctController.getInstance().dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}

		try {
		sUiccController.dump(fd, pw, args);
		} catch (Exception e) {

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

+1 −17

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import android.telephony.TelephonyManager;
		import android.util.Log;

		import com.android.internal.telephony.PhoneSwitcher;
		import com.android.internal.telephony.dataconnection.DctController;
		import com.android.internal.telephony.uicc.UiccController;

		import java.io.FileDescriptor;
		@@ -73,8 +72,6 @@ public class ProxyController {
		private Context mContext;

		private PhoneSwitcher mPhoneSwitcher;
		// TODO - remove
		private DctController mDctController;

		//UiccPhoneBookController to use proper IccPhoneBookInterfaceManagerProxy object
		private UiccPhoneBookController mUiccPhoneBookController;
		@@ -131,8 +128,6 @@ public class ProxyController {
		mCi = ci;
		mPhoneSwitcher = phoneSwitcher;

		// TODO - remove
		mDctController = DctController.makeDctController(phone);
		mUiccPhoneBookController = new UiccPhoneBookController(mPhones);
		mPhoneSubInfoController = new PhoneSubInfoController(mContext, mPhones);
		mUiccSmsController = new UiccSmsController(mPhones);
		@@ -460,9 +455,7 @@ public class ProxyController {
		logd("onNotificationRadioCapabilityChanged: phoneId=" + id + " status=SUCCESS");
		mSetRadioAccessFamilyStatus[id] = SET_RC_STATUS_SUCCESS;
		// The modems may have been restarted and forgotten this
		// TODO - switch these
		// mPhoneSwitcher.resendDataAllowed(id);
		mDctController.retryAttach(id);
		mPhoneSwitcher.resendDataAllowed(id);
		mPhones[id].radioCapabilityUpdated(rc);
		}

		@@ -667,13 +660,4 @@ public class ProxyController {
		private void loge(String string) {
		Rlog.e(LOG_TAG, string);
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		try {
		// TODO remove
		mDctController.dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}
		}
		}

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

deleted100644 → 0

+0 −185

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony.dataconnection;

		import android.net.NetworkRequest;
		import android.os.Message;
		import android.telephony.Rlog;
		import android.telephony.SubscriptionManager;
		import android.util.LocalLog;

		import com.android.internal.util.AsyncChannel;
		import com.android.internal.util.Protocol;
		import com.android.internal.telephony.PhoneConstants;

		public class DcSwitchAsyncChannel extends AsyncChannel {
		private static final boolean DBG = true;
		private static final boolean VDBG = false;
		private static final String LOG_TAG = "DcSwitchAsyncChannel";

		private int tagId = 0;
		private DcSwitchStateMachine mDcSwitchState;

		// ***** Event codes for driving the state machine
		private static final int BASE = Protocol.BASE_DATA_CONNECTION_TRACKER + 0x00002000;
		static final int REQ_CONNECT = BASE + 0;
		static final int REQ_RETRY_CONNECT = BASE + 1;
		static final int REQ_DISCONNECT_ALL = BASE + 2;
		static final int REQ_IS_IDLE_STATE = BASE + 3;
		static final int RSP_IS_IDLE_STATE = BASE + 4;
		static final int REQ_IS_IDLE_OR_DETACHING_STATE = BASE + 5;
		static final int RSP_IS_IDLE_OR_DETACHING_STATE = BASE + 6;
		static final int EVENT_DATA_ATTACHED = BASE + 7;
		static final int EVENT_DATA_DETACHED = BASE + 8;
		static final int EVENT_EMERGENCY_CALL_STARTED = BASE + 9;
		static final int EVENT_EMERGENCY_CALL_ENDED = BASE + 10;

		private static final int CMD_TO_STRING_COUNT = EVENT_EMERGENCY_CALL_ENDED - BASE + 1;
		private static String[] sCmdToString = new String[CMD_TO_STRING_COUNT];
		static {
		sCmdToString[REQ_CONNECT - BASE] = "REQ_CONNECT";
		sCmdToString[REQ_RETRY_CONNECT - BASE] = "REQ_RETRY_CONNECT";
		sCmdToString[REQ_DISCONNECT_ALL - BASE] = "REQ_DISCONNECT_ALL";
		sCmdToString[REQ_IS_IDLE_STATE - BASE] = "REQ_IS_IDLE_STATE";
		sCmdToString[RSP_IS_IDLE_STATE - BASE] = "RSP_IS_IDLE_STATE";
		sCmdToString[REQ_IS_IDLE_OR_DETACHING_STATE - BASE] = "REQ_IS_IDLE_OR_DETACHING_STATE";
		sCmdToString[RSP_IS_IDLE_OR_DETACHING_STATE - BASE] = "RSP_IS_IDLE_OR_DETACHING_STATE";
		sCmdToString[EVENT_DATA_ATTACHED - BASE] = "EVENT_DATA_ATTACHED";
		sCmdToString[EVENT_DATA_DETACHED - BASE] = "EVENT_DATA_DETACHED";
		sCmdToString[EVENT_EMERGENCY_CALL_STARTED - BASE] = "EVENT_EMERGENCY_CALL_STARTED";
		sCmdToString[EVENT_EMERGENCY_CALL_ENDED - BASE] = "EVENT_EMERGENCY_CALL_ENDED";
		}

		public static class RequestInfo {
		final NetworkRequest request;
		final int priority;
		int executedPhoneId;
		private final LocalLog requestLog;

		public RequestInfo(NetworkRequest request, int priority, LocalLog l) {
		this.request = request;
		this.priority = priority;
		this.requestLog = l;
		this.executedPhoneId = SubscriptionManager.INVALID_PHONE_INDEX;
		}

		public void log(String str) {
		requestLog.log(str);
		}

		public LocalLog getLog() {
		return requestLog;
		}

		@Override
		public String toString() {
		return "[ request=" + request + ", executedPhoneId=" + executedPhoneId +
		", priority=" + priority + "]";
		}
		}

		protected static String cmdToString(int cmd) {
		cmd -= BASE;
		if ((cmd >= 0) && (cmd < sCmdToString.length)) {
		return sCmdToString[cmd];
		} else {
		return AsyncChannel.cmdToString(cmd + BASE);
		}
		}

		public DcSwitchAsyncChannel(DcSwitchStateMachine dcSwitchState, int id) {
		mDcSwitchState = dcSwitchState;
		tagId = id;
		}

		public int connect(RequestInfo apnRequest) {
		sendMessage(REQ_CONNECT, apnRequest);
		return PhoneConstants.APN_REQUEST_STARTED;
		}

		public void retryConnect() {
		sendMessage(REQ_RETRY_CONNECT);
		}

		public int disconnectAll() {
		sendMessage(REQ_DISCONNECT_ALL);
		return PhoneConstants.APN_REQUEST_STARTED;
		}

		public void notifyDataAttached() {
		sendMessage(EVENT_DATA_ATTACHED);
		}

		public void notifyDataDetached() {
		sendMessage(EVENT_DATA_DETACHED);
		}

		public void notifyEmergencyCallToggled(int start) {
		if (start != 0) {
		sendMessage(EVENT_EMERGENCY_CALL_STARTED);
		} else {
		sendMessage(EVENT_EMERGENCY_CALL_ENDED);
		}
		}

		private boolean rspIsIdle(Message response) {
		boolean retVal = response.arg1 == 1;
		if (DBG) log("rspIsIdle=" + retVal);
		return retVal;
		}

		public boolean isIdleSync() {
		Message response = sendMessageSynchronously(REQ_IS_IDLE_STATE);
		if ((response != null) && (response.what == RSP_IS_IDLE_STATE)) {
		return rspIsIdle(response);
		} else {
		if (DBG) log("rspIsIndle error response=" + response);
		return false;
		}
		}

		public void reqIsIdleOrDetaching() {
		sendMessage(REQ_IS_IDLE_OR_DETACHING_STATE);
		if (DBG) log("reqIsIdleOrDetaching");
		}

		public boolean rspIsIdleOrDetaching(Message response) {
		boolean retVal = response.arg1 == 1;
		if (DBG) log("rspIsIdleOrDetaching=" + retVal);
		return retVal;
		}

		public boolean isIdleOrDetachingSync() {
		Message response = sendMessageSynchronously(REQ_IS_IDLE_OR_DETACHING_STATE);
		if ((response != null) && (response.what == RSP_IS_IDLE_OR_DETACHING_STATE)) {
		return rspIsIdleOrDetaching(response);
		} else {
		if (DBG) log("rspIsIdleOrDetaching error response=" + response);
		return false;
		}
		}

		@Override
		public String toString() {
		return mDcSwitchState.getName();
		}

		private void log(String s) {
		Rlog.d(LOG_TAG, "[DcSwitchAsyncChannel-" + tagId + "]: " + s);
		}

		}

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

deleted100644 → 0

+0 −492

File deleted.

Preview size limit exceeded, changes collapsed.

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

+0 −17

Original line number	Diff line number	Diff line
		@@ -832,23 +832,6 @@ public class DcTracker extends Handler {
		mPhone.notifyDataActivity();
		}

		// TODO - remove
		void incApnRefCount(String name, LocalLog log) {
		ApnContext apnContext = mApnContexts.get(name);
		log.log("DcTracker.incApnRefCount on " + name + " found " + apnContext);
		if (apnContext != null) {
		apnContext.incRefCount(log);
		}
		}

		void decApnRefCount(String name, LocalLog log) {
		ApnContext apnContext = mApnContexts.get(name);
		log.log("DcTracker.decApnRefCount on " + name + " found " + apnContext);
		if (apnContext != null) {
		apnContext.decRefCount(log);
		}
		}

		public void requestNetwork(NetworkRequest networkRequest, LocalLog log) {
		final int apnId = ApnContext.apnIdForNetworkRequest(networkRequest);
		final ApnContext apnContext = mApnContextsById.get(apnId);