Rename a few files and variables. (454b1dfd) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ public class DebugService {
		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");
		try {
		phoneBase.mDataConnectionTracker.dump(fd, pw, args);
		phoneBase.mDcTracker.dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ import android.text.TextUtils;
		import android.telephony.Rlog;

		import com.android.internal.R;
		import com.android.internal.telephony.dataconnection.DataConnectionTrackerBase;
		import com.android.internal.telephony.dataconnection.DcTrackerBase;
		import com.android.internal.telephony.test.SimulatedRadioControl;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;
		import com.android.internal.telephony.uicc.IccFileHandler;
		@@ -124,7 +124,7 @@ public abstract class PhoneBase extends Handler implements Phone {
		/* Instance Variables */
		public CommandsInterface mCi;
		boolean mDnsCheckDisabled;
		public DataConnectionTrackerBase mDataConnectionTracker;
		public DcTrackerBase mDcTracker;
		boolean mDoesRilSendMultipleCallRing;
		int mCallRingContinueToken;
		int mCallRingDelay;
		@@ -306,7 +306,7 @@ public abstract class PhoneBase extends Handler implements Phone {
		synchronized(PhoneProxy.lockForRadioTechnologyChange) {
		mCi.unSetOnCallRing(this);
		// Must cleanup all connectionS and needs to use sendMessage!
		mDataConnectionTracker.cleanUpAllConnections(null);
		mDcTracker.cleanUpAllConnections(null);
		mIsTheCurrentActivePhone = false;
		// Dispose the SMS usage and storage monitors
		mSmsStorageMonitor.dispose();
		@@ -326,7 +326,7 @@ public abstract class PhoneBase extends Handler implements Phone {
		mSMS = null;
		mIccRecords.set(null);
		mUiccApplication.set(null);
		mDataConnectionTracker = null;
		mDcTracker = null;
		mUiccController = null;
		}

		@@ -1184,32 +1184,32 @@ public abstract class PhoneBase extends Handler implements Phone {

		@Override
		public String[] getActiveApnTypes() {
		return mDataConnectionTracker.getActiveApnTypes();
		return mDcTracker.getActiveApnTypes();
		}

		@Override
		public String getActiveApnHost(String apnType) {
		return mDataConnectionTracker.getActiveApnString(apnType);
		return mDcTracker.getActiveApnString(apnType);
		}

		@Override
		public LinkProperties getLinkProperties(String apnType) {
		return mDataConnectionTracker.getLinkProperties(apnType);
		return mDcTracker.getLinkProperties(apnType);
		}

		@Override
		public LinkCapabilities getLinkCapabilities(String apnType) {
		return mDataConnectionTracker.getLinkCapabilities(apnType);
		return mDcTracker.getLinkCapabilities(apnType);
		}

		@Override
		public int enableApnType(String type) {
		return mDataConnectionTracker.enableApnType(type);
		return mDcTracker.enableApnType(type);
		}

		@Override
		public int disableApnType(String type) {
		return mDataConnectionTracker.disableApnType(type);
		return mDcTracker.disableApnType(type);
		}

		@Override
		@@ -1219,8 +1219,8 @@ public abstract class PhoneBase extends Handler implements Phone {

		@Override
		public boolean isDataConnectivityPossible(String apnType) {
		return ((mDataConnectionTracker != null) &&
		(mDataConnectionTracker.isDataPossible(apnType)));
		return ((mDcTracker != null) &&
		(mDcTracker.isDataPossible(apnType)));
		}

		/**
		@@ -1358,7 +1358,7 @@ public abstract class PhoneBase extends Handler implements Phone {
		pw.println("PhoneBase:");
		pw.println(" mCi=" + mCi);
		pw.println(" mDnsCheckDisabled=" + mDnsCheckDisabled);
		pw.println(" mDataConnectionTracker=" + mDataConnectionTracker);
		pw.println(" mDcTracker=" + mDcTracker);
		pw.println(" mDoesRilSendMultipleCallRing=" + mDoesRilSendMultipleCallRing);
		pw.println(" mCallRingContinueToken=" + mCallRingContinueToken);
		pw.println(" mCallRingDelay=" + mCallRingDelay);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.List;

		import com.android.internal.telephony.dataconnection.DataConnectionTrackerBase;
		import com.android.internal.telephony.dataconnection.DcTrackerBase;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
		import com.android.internal.telephony.uicc.IccRecords;
		import com.android.internal.telephony.uicc.UiccCardApplication;
		@@ -454,7 +454,7 @@ public abstract class ServiceStateTracker extends Handler {
		*
		* Hang up the existing voice calls to decrease call drop rate.
		*/
		public void powerOffRadioSafely(DataConnectionTrackerBase dcTracker) {
		public void powerOffRadioSafely(DcTrackerBase dcTracker) {
		synchronized (this) {
		if (!mPendingRadioPowerOffAfterDataOff) {
		// To minimize race conditions we call cleanUpAllConnections on

src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -120,10 +120,10 @@ public class CDMALTEPhone extends CDMAPhone {
		// removeReferences() have already been called

		ret = PhoneConstants.DataState.DISCONNECTED;
		} else if (mDataConnectionTracker.isApnTypeEnabled(apnType) == false) {
		} else if (mDcTracker.isApnTypeEnabled(apnType) == false) {
		ret = PhoneConstants.DataState.DISCONNECTED;
		} else {
		switch (mDataConnectionTracker.getState(apnType)) {
		switch (mDcTracker.getState(apnType)) {
		case FAILED:
		case IDLE:
		ret = PhoneConstants.DataState.DISCONNECTED;

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ import com.android.internal.telephony.ServiceStateTracker;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.internal.telephony.UUSInfo;
		import com.android.internal.telephony.dataconnection.DataConnectionTracker;
		import com.android.internal.telephony.dataconnection.DcTracker;
		import com.android.internal.telephony.uicc.IccException;
		import com.android.internal.telephony.uicc.IccRecords;
		import com.android.internal.telephony.uicc.RuimRecords;
		@@ -160,7 +160,7 @@ public class CDMAPhone extends PhoneBase {
		mCdmaSSM = CdmaSubscriptionSourceManager.getInstance(context, mCi, this,
		EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED, null);
		mSMS = new CdmaSMSDispatcher(this, mSmsStorageMonitor, mSmsUsageMonitor);
		mDataConnectionTracker = new DataConnectionTracker (this);
		mDcTracker = new DcTracker(this);
		mRuimPhoneBookInterfaceManager = new RuimPhoneBookInterfaceManager(this);
		mRuimSmsInterfaceManager = new RuimSmsInterfaceManager(this, mSMS);
		mSubInfo = new PhoneSubInfo(this);
		@@ -232,7 +232,7 @@ public class CDMAPhone extends PhoneBase {

		//Force all referenced classes to unregister their former registered events
		mCT.dispose();
		mDataConnectionTracker.dispose();
		mDcTracker.dispose();
		mSST.dispose();
		mCdmaSSM.dispose(this);
		mSMS.dispose();
		@@ -338,7 +338,7 @@ public class CDMAPhone extends PhoneBase {

		if (mSST.getCurrentDataConnectionState() == ServiceState.STATE_IN_SERVICE) {

		switch (mDataConnectionTracker.getActivity()) {
		switch (mDcTracker.getActivity()) {
		case DATAIN:
		ret = DataActivityState.DATAIN;
		break;
		@@ -590,7 +590,7 @@ public class CDMAPhone extends PhoneBase {

		@Override
		public void setDataRoamingEnabled(boolean enable) {
		mDataConnectionTracker.setDataOnRoamingEnabled(enable);
		mDcTracker.setDataOnRoamingEnabled(enable);
		}

		@Override
		@@ -665,11 +665,11 @@ public class CDMAPhone extends PhoneBase {
		// If we're out of service, open TCP sockets may still work
		// but no data will flow
		ret = PhoneConstants.DataState.DISCONNECTED;
		} else if (mDataConnectionTracker.isApnTypeEnabled(apnType) == false \|\|
		mDataConnectionTracker.isApnTypeActive(apnType) == false) {
		} else if (mDcTracker.isApnTypeEnabled(apnType) == false \|\|
		mDcTracker.isApnTypeActive(apnType) == false) {
		ret = PhoneConstants.DataState.DISCONNECTED;
		} else {
		switch (mDataConnectionTracker.getState(apnType)) {
		switch (mDcTracker.getState(apnType)) {
		case FAILED:
		case IDLE:
		ret = PhoneConstants.DataState.DISCONNECTED;
		@@ -772,7 +772,7 @@ public class CDMAPhone extends PhoneBase {

		@Override
		public boolean getDataRoamingEnabled() {
		return mDataConnectionTracker.getDataOnRoamingEnabled();
		return mDcTracker.getDataOnRoamingEnabled();
		}

		@Override
		@@ -983,7 +983,7 @@ public class CDMAPhone extends PhoneBase {
		// send an Intent
		sendEmergencyCallbackModeChange();
		// Re-initiate data connection
		mDataConnectionTracker.setInternalDataEnabled(true);
		mDcTracker.setInternalDataEnabled(true);
		}
		}