Merge "Delete unused GSMPhone debugging code." (99de2417) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/gsm/GSMPhone.java

+0 −39

Original line number	Diff line number	Diff line
		@@ -92,7 +92,6 @@ public class GSMPhone extends PhoneBase {
		static final String LOG_TAG = "GSMPhone";
		private static final boolean LOCAL_DEBUG = true;
		private static final boolean VDBG = false; /* STOPSHIP if true */
		private static final boolean DBG_PORT = false; /* STOPSHIP if true */

		// Key used to read/write current ciphering state
		public static final String CIPHERING_KEY = "ciphering_key";
		@@ -115,9 +114,6 @@ public class GSMPhone extends PhoneBase {
		/** List of Registrants to receive Supplementary Service Notifications. */
		RegistrantList mSsnRegistrants = new RegistrantList();

		Thread mDebugPortThread;
		ServerSocket mDebugSocket;

		private String mImei;
		private String mImeiSv;
		private String mVmNumber;
		@@ -157,41 +153,6 @@ public class GSMPhone extends PhoneBase {
		mCi.setOnSuppServiceNotification(this, EVENT_SSN, null);
		mSST.registerForNetworkAttached(this, EVENT_REGISTERED_TO_NETWORK, null);

		if (DBG_PORT) {
		try {
		//debugSocket = new LocalServerSocket("com.android.internal.telephony.debug");
		mDebugSocket = new ServerSocket();
		mDebugSocket.setReuseAddress(true);
		mDebugSocket.bind (new InetSocketAddress("127.0.0.1", 6666));

		mDebugPortThread
		= new Thread(
		new Runnable() {
		@Override
		public void run() {
		for(;;) {
		try {
		Socket sock;
		sock = mDebugSocket.accept();
		Rlog.i(LOG_TAG, "New connection; resetting radio");
		mCi.resetRadio(null);
		sock.close();
		} catch (IOException ex) {
		Rlog.w(LOG_TAG,
		"Exception accepting socket", ex);
		}
		}
		}
		},
		"GSMPhone debug");

		mDebugPortThread.start();

		} catch (IOException ex) {
		Rlog.w(LOG_TAG, "Failure to open com.android.internal.telephony.debug socket", ex);
		}
		}

		//Change the system property
		SystemProperties.set(TelephonyProperties.CURRENT_ACTIVE_PHONE,
		new Integer(PhoneConstants.PHONE_TYPE_GSM).toString());