Merge "Cleanup/add log statements." into honeycomb-LTE (6ed4798c) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/RIL.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -906,10 +906,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		getIMSI(Message result) {
		RILRequest rr = RILRequest.obtain(RIL_REQUEST_GET_IMSI, result);

		if (RILJ_LOGD) riljLog(rr.serialString() +
		"> getIMSI:RIL_REQUEST_GET_IMSI " +
		RIL_REQUEST_GET_IMSI +
		" " + requestToString(rr.mRequest));
		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));

		send(rr);
		}

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -640,7 +640,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		if (DBG) {
		log("trySetupData for type:" + apnContext.getApnType() +
		" due to " + apnContext.getReason());
		log("[DSAC DEB] " + "trySetupData with mIsPsRestricted=" + mIsPsRestricted);
		log("trySetupData with mIsPsRestricted=" + mIsPsRestricted);
		}

		if (mPhone.getSimulatedRadioControl() != null) {
		@@ -943,8 +943,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {

		// TODO: It'd be nice to only do this if the changed entrie(s)
		// match the current operator.
		if (DBG) log("onApnChanged createAllApnList and cleanUpAllConnections");
		createAllApnList();
		if (DBG) log("onApnChanged clean all connections");
		cleanUpAllConnections(isConnected, Phone.REASON_APN_CHANGED);
		if (!isConnected) {
		// TODO: Won't work for multiple connections!!!!
		@@ -1298,6 +1298,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		}

		private void onRecordsLoaded() {
		if (DBG) log("onRecordsLoaded: createAllApnList");
		createAllApnList();
		for (ApnContext apnContext : mApnContexts.values()) {
		if (apnContext.isReady()) {
		@@ -1922,7 +1923,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		* PDP context and notify us with PDP_CONTEXT_CHANGED.
		* But we should stop the network polling and prevent reset PDP.
		*/
		log("[DSAC DEB] " + "EVENT_PS_RESTRICT_ENABLED " + mIsPsRestricted);
		log("EVENT_PS_RESTRICT_ENABLED " + mIsPsRestricted);
		stopNetStatPoll();
		mIsPsRestricted = true;
		break;
		@@ -1932,7 +1933,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		* When PS restrict is removed, we need setup PDP connection if
		* PDP connection is down.
		*/
		log("[DSAC DEB] " + "EVENT_PS_RESTRICT_DISABLED " + mIsPsRestricted);
		log("EVENT_PS_RESTRICT_DISABLED " + mIsPsRestricted);
		mIsPsRestricted = false;
		if (isConnected()) {
		startNetStatPoll();

telephony/java/com/android/internal/telephony/gsm/SIMRecords.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -472,17 +472,23 @@ public final class SIMRecords extends IccRecords {
		* provided the SIM card. Returns null of SIM is not yet ready
		*/
		public String getSIMOperatorNumeric() {
		if (imsi == null \|\| mncLength == UNINITIALIZED \|\| mncLength == UNKNOWN) {
		if (imsi == null) {
		Log.d(LOG_TAG, "getSIMOperatorNumeric: IMSI == null");
		return null;
		}
		if (mncLength == UNINITIALIZED \|\| mncLength == UNKNOWN) {
		Log.d(LOG_TAG, "getSIMOperatorNumeric: bad mncLength");
		return null;
		}

		// Length = length of MCC + length of MNC
		// length of mcc = 3 (TS 23.003 Section 2.2)
		// STOPSHIP: to be removed
		if (SystemProperties.getInt(com.android.internal.telephony.TelephonyProperties
		.PROPERTY_NETWORK_LTE_ON_CDMA, 0) == 1) {
		Log.e(LOG_TAG, "getSIMOperatorNumeric: STOPSHIP bad numeric operators in lte");
		return SystemProperties.get("ro.cdma.home.operator.numeric", "310004");
		}
		// Length = length of MCC + length of MNC
		// length of mcc = 3 (TS 23.003 Section 2.2)
		return imsi.substring(0, 3 + mncLength);
		}

		@@ -524,7 +530,7 @@ public final class SIMRecords extends IccRecords {
		imsi = null;
		}

		Log.d(LOG_TAG, "IMSI: " + imsi.substring(0, 6) + "xxxxxxx");
		Log.d(LOG_TAG, "IMSI: " + /* imsi.substring(0, 6) +*/ "xxxxxxx");

		if (((mncLength == UNKNOWN) \|\| (mncLength == 2)) &&
		((imsi != null) && (imsi.length() >= 6))) {