Move DataConnection related classes to their own package.
Wink Saville [Thu, 21 Feb 2013 17:34:34 +0000 (09:34 -0800)]
Change-Id: I34ee9e87545e6b15ebf4d3ec101d4ed3d322f7b2

18 files changed:
CleanSpec.mk
src/java/com/android/internal/telephony/DataCallState.java
src/java/com/android/internal/telephony/Phone.java
src/java/com/android/internal/telephony/PhoneBase.java
src/java/com/android/internal/telephony/RIL.java
src/java/com/android/internal/telephony/ServiceStateTracker.java
src/java/com/android/internal/telephony/cdma/CDMAPhone.java
src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
src/java/com/android/internal/telephony/dataconnection/ApnContext.java [moved from src/java/com/android/internal/telephony/ApnContext.java with 97% similarity]
src/java/com/android/internal/telephony/dataconnection/ApnSetting.java [moved from src/java/com/android/internal/telephony/ApnSetting.java with 97% similarity]
src/java/com/android/internal/telephony/dataconnection/DataConnection.java [moved from src/java/com/android/internal/telephony/DataConnection.java with 99% similarity]
src/java/com/android/internal/telephony/dataconnection/DataConnectionAc.java [moved from src/java/com/android/internal/telephony/DataConnectionAc.java with 98% similarity]
src/java/com/android/internal/telephony/dataconnection/DataConnectionTracker.java [moved from src/java/com/android/internal/telephony/DataConnectionTracker.java with 99% similarity]
src/java/com/android/internal/telephony/dataconnection/GsmDataConnection.java [moved from src/java/com/android/internal/telephony/gsm/GsmDataConnection.java with 97% similarity]
src/java/com/android/internal/telephony/dataconnection/GsmDataConnectionTracker.java [moved from src/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java with 99% similarity]
src/java/com/android/internal/telephony/gsm/GSMPhone.java
src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
src/java/com/android/internal/telephony/sip/SipPhoneBase.java

index e74cedb..c5b95a1 100644 (file)
@@ -43,6 +43,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/teleph
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
index c3a3b1d..45e39a4 100644 (file)
@@ -24,7 +24,7 @@ import android.net.RouteInfo;
 import android.os.SystemProperties;
 import android.telephony.Rlog;
 
-import com.android.internal.telephony.DataConnection.FailCause;
+import com.android.internal.telephony.dataconnection.DataConnection.FailCause;
 
 import java.net.Inet4Address;
 import java.net.InetAddress;
index fbce476..1404774 100644 (file)
@@ -21,14 +21,12 @@ import android.net.LinkCapabilities;
 import android.net.LinkProperties;
 import android.os.Handler;
 import android.os.Message;
-import android.os.SystemProperties;
 import android.telephony.CellInfo;
 import android.telephony.CellLocation;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
 
-import com.android.internal.telephony.DataConnection;
 import com.android.internal.telephony.test.SimulatedRadioControl;
 import com.android.internal.telephony.uicc.IsimRecords;
 import com.android.internal.telephony.uicc.UsimServiceTable;
index c62f72f..6f24b49 100644 (file)
@@ -39,6 +39,7 @@ import android.text.TextUtils;
 import android.telephony.Rlog;
 
 import com.android.internal.R;
+import com.android.internal.telephony.dataconnection.DataConnectionTracker;
 import com.android.internal.telephony.test.SimulatedRadioControl;
 import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;
 import com.android.internal.telephony.uicc.IccFileHandler;
index 6840b46..c4dfcea 100644 (file)
@@ -59,6 +59,7 @@ import com.android.internal.telephony.uicc.IccUtils;
 import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;
 import com.android.internal.telephony.cdma.CdmaInformationRecords;
 import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;
+import com.android.internal.telephony.dataconnection.DataConnection;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
index 088d3cb..5a37a48 100644 (file)
@@ -33,6 +33,7 @@ import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.List;
 
+import com.android.internal.telephony.dataconnection.DataConnectionTracker;
 import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
 import com.android.internal.telephony.uicc.IccRecords;
 import com.android.internal.telephony.uicc.UiccCardApplication;
index b87db8b..3ab4780 100755 (executable)
@@ -64,7 +64,7 @@ import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.internal.telephony.UUSInfo;
 import com.android.internal.telephony.cat.CatService;
-import com.android.internal.telephony.gsm.GsmDataConnectionTracker;
+import com.android.internal.telephony.dataconnection.GsmDataConnectionTracker;
 import com.android.internal.telephony.uicc.IccException;
 import com.android.internal.telephony.uicc.IccFileHandler;
 import com.android.internal.telephony.uicc.IccRecords;
index 2507630..984da07 100755 (executable)
@@ -18,7 +18,7 @@ package com.android.internal.telephony.cdma;
 
 import com.android.internal.telephony.CommandException;
 import com.android.internal.telephony.CommandsInterface;
-import com.android.internal.telephony.DataConnectionTracker;
+import com.android.internal.telephony.dataconnection.DataConnectionTracker;
 import com.android.internal.telephony.EventLogTags;
 import com.android.internal.telephony.IccCardConstants;
 import com.android.internal.telephony.MccTable;
  * limitations under the License.
  */
 
-package com.android.internal.telephony;
+package com.android.internal.telephony.dataconnection;
 
 import android.telephony.Rlog;
 
+import com.android.internal.telephony.DctConstants;
+import com.android.internal.telephony.Phone;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
  * limitations under the License.
  */
 
-package com.android.internal.telephony;
+package com.android.internal.telephony.dataconnection;
+
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.RILConstants;
 
 /**
  * This class represents a apn setting for create PDP link
  * limitations under the License.
  */
 
-package com.android.internal.telephony;
+package com.android.internal.telephony.dataconnection;
 
 
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.DataCallState;
+import com.android.internal.telephony.DctConstants;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneBase;
+import com.android.internal.telephony.RILConstants;
+import com.android.internal.telephony.RetryManager;
 import com.android.internal.util.AsyncChannel;
 import com.android.internal.util.Protocol;
 import com.android.internal.util.State;
@@ -163,7 +170,7 @@ public abstract class DataConnection extends StateMachine {
             mErrorCode = errorCode;
         }
 
-        int getErrorCode() {
+        public int getErrorCode() {
             return mErrorCode;
         }
 
  * limitations under the License.
  */
 
-package com.android.internal.telephony;
+package com.android.internal.telephony.dataconnection;
 
-import com.android.internal.telephony.DataConnection.UpdateLinkPropertyResult;
+import com.android.internal.telephony.DataCallState;
+import com.android.internal.telephony.dataconnection.DataConnection.UpdateLinkPropertyResult;
 import com.android.internal.util.AsyncChannel;
 import com.android.internal.util.Protocol;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.internal.telephony;
+package com.android.internal.telephony.dataconnection;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -47,8 +47,12 @@ import android.util.EventLog;
 import android.telephony.Rlog;
 
 import com.android.internal.R;
-import com.android.internal.telephony.DataConnection.FailCause;
+import com.android.internal.telephony.dataconnection.DataConnection.FailCause;
 import com.android.internal.telephony.DctConstants;
+import com.android.internal.telephony.EventLogTags;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneBase;
+import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.uicc.IccRecords;
 import com.android.internal.telephony.uicc.UiccController;
 import com.android.internal.util.AsyncChannel;
@@ -558,7 +562,7 @@ public abstract class DataConnectionTracker extends Handler {
     protected abstract void onVoiceCallEnded();
     protected abstract void onCleanUpConnection(boolean tearDown, int apnId, String reason);
     protected abstract void onCleanUpAllConnections(String cause);
-    protected abstract boolean isDataPossible(String apnType);
+    public abstract boolean isDataPossible(String apnType);
     protected abstract void onUpdateIcc();
 
     @Override
@@ -747,7 +751,7 @@ public abstract class DataConnectionTracker extends Handler {
         }
     }
 
-    protected LinkProperties getLinkProperties(String apnType) {
+    public LinkProperties getLinkProperties(String apnType) {
         int id = apnTypeToId(apnType);
 
         if (isApnIdEnabled(id)) {
@@ -759,7 +763,7 @@ public abstract class DataConnectionTracker extends Handler {
         }
     }
 
-    protected LinkCapabilities getLinkCapabilities(String apnType) {
+    public LinkCapabilities getLinkCapabilities(String apnType) {
         int id = apnTypeToId(apnType);
         if (isApnIdEnabled(id)) {
             // TODO - remove this cdma-only hack and support multiple DCs.
  * limitations under the License.
  */
 
-package com.android.internal.telephony.gsm;
+package com.android.internal.telephony.dataconnection;
 
 import android.os.Message;
 import android.telephony.Rlog;
 import android.util.Patterns;
 import android.text.TextUtils;
 
-import com.android.internal.telephony.DataConnection;
-import com.android.internal.telephony.DataConnectionTracker;
 import com.android.internal.telephony.PhoneBase;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.RILConstants;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.internal.telephony.gsm;
+package com.android.internal.telephony.dataconnection;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -51,16 +51,19 @@ import android.text.TextUtils;
 import android.util.EventLog;
 import android.telephony.Rlog;
 
-import com.android.internal.telephony.ApnContext;
-import com.android.internal.telephony.ApnSetting;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneBase;
+import com.android.internal.telephony.dataconnection.ApnContext;
+import com.android.internal.telephony.dataconnection.ApnSetting;
 import com.android.internal.telephony.DataCallState;
-import com.android.internal.telephony.DataConnection;
-import com.android.internal.telephony.DataConnection.FailCause;
-import com.android.internal.telephony.DataConnection.UpdateLinkPropertyResult;
-import com.android.internal.telephony.DataConnectionAc;
-import com.android.internal.telephony.DataConnectionTracker;
+import com.android.internal.telephony.dataconnection.DataConnection;
+import com.android.internal.telephony.dataconnection.DataConnection.FailCause;
+import com.android.internal.telephony.dataconnection.DataConnection.UpdateLinkPropertyResult;
+import com.android.internal.telephony.dataconnection.DataConnectionAc;
+import com.android.internal.telephony.dataconnection.DataConnectionTracker;
 import com.android.internal.telephony.DctConstants;
 import com.android.internal.telephony.EventLogTags;
+import com.android.internal.telephony.gsm.GSMPhone;
 import com.android.internal.telephony.IccCard;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneBase;
@@ -249,7 +252,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
     }
 
     @Override
-    protected boolean isDataPossible(String apnType) {
+    public boolean isDataPossible(String apnType) {
         ApnContext apnContext = mApnContexts.get(apnType);
         if (apnContext == null) {
             return false;
@@ -346,7 +349,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
     }
 
     @Override
-    protected LinkProperties getLinkProperties(String apnType) {
+    public LinkProperties getLinkProperties(String apnType) {
         ApnContext apnContext = mApnContexts.get(apnType);
         if (apnContext != null) {
             DataConnectionAc dcac = apnContext.getDataConnectionAc();
@@ -360,7 +363,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
     }
 
     @Override
-    protected LinkCapabilities getLinkCapabilities(String apnType) {
+    public LinkCapabilities getLinkCapabilities(String apnType) {
         ApnContext apnContext = mApnContexts.get(apnType);
         if (apnContext!=null) {
             DataConnectionAc dataConnectionAc = apnContext.getDataConnectionAc();
index 6fe09a4..b130b2d 100644 (file)
@@ -51,6 +51,7 @@ import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_VOI
 import static com.android.internal.telephony.TelephonyProperties.PROPERTY_BASEBAND_VERSION;
 
 import com.android.internal.telephony.cat.CatService;
+import com.android.internal.telephony.dataconnection.GsmDataConnectionTracker;
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallForwardInfo;
 import com.android.internal.telephony.CallStateException;
@@ -1378,7 +1379,7 @@ public class GSMPhone extends PhoneBase {
      *
      * @return true for success; false otherwise.
      */
-    boolean updateCurrentCarrierInProvider() {
+    public boolean updateCurrentCarrierInProvider() {
         IccRecords r = mIccRecords.get();
         if (r != null) {
             try {
index b41855a..3e59be3 100644 (file)
@@ -18,7 +18,7 @@ package com.android.internal.telephony.gsm;
 
 import com.android.internal.telephony.CommandException;
 import com.android.internal.telephony.CommandsInterface;
-import com.android.internal.telephony.DataConnectionTracker;
+import com.android.internal.telephony.dataconnection.DataConnectionTracker;
 import com.android.internal.telephony.EventLogTags;
 import com.android.internal.telephony.IccCard;
 import com.android.internal.telephony.IccCardConstants;
index 041ac79..aca2536 100755 (executable)
@@ -33,7 +33,7 @@ import android.telephony.Rlog;
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Connection;
-import com.android.internal.telephony.DataConnection;
+import com.android.internal.telephony.dataconnection.DataConnection;
 import com.android.internal.telephony.IccCard;
 import com.android.internal.telephony.IccPhoneBookInterfaceManager;
 import com.android.internal.telephony.IccSmsInterfaceManager;