Merge "Remove unused gsm.defaultpdpcontext.active" (1f0d3d22) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −28

Original line number	Diff line number	Diff line
		@@ -616,11 +616,6 @@ public class DcTracker extends Handler {

		//***** Constants

		// Used by puppetmaster/*/radio_stress.py
		private static final String PUPPET_MASTER_RADIO_STRESS_TEST = "gsm.defaultpdpcontext.active";

		private static final int POLL_PDP_MILLIS = 5 * 1000;

		private static final int PROVISIONING_SPINNER_TIMEOUT_MILLIS = 120 * 1000;

		static final Uri PREFERAPN_NO_UPDATE_URI_USING_SUBID =
		@@ -2694,26 +2689,14 @@ public class DcTracker extends Handler {
		}

		// everything is setup
		if (TextUtils.equals(apnContext.getApnType(), PhoneConstants.APN_TYPE_DEFAULT)) {
		try {
		SystemProperties.set(PUPPET_MASTER_RADIO_STRESS_TEST, "true");
		} catch (RuntimeException ex) {
		log("Failed to set PUPPET_MASTER_RADIO_STRESS_TEST to true");
		}
		if (mCanSetPreferApn && mPreferredApn == null) {
		if (TextUtils.equals(apnContext.getApnType(), PhoneConstants.APN_TYPE_DEFAULT)
		&& mCanSetPreferApn && mPreferredApn == null) {
		if (DBG) log("onDataSetupComplete: PREFERRED APN is null");
		mPreferredApn = apn;
		if (mPreferredApn != null) {
		setPreferredApn(mPreferredApn.getId());
		}
		}
		} else {
		try {
		SystemProperties.set(PUPPET_MASTER_RADIO_STRESS_TEST, "false");
		} catch (RuntimeException ex) {
		log("Failed to set PUPPET_MASTER_RADIO_STRESS_TEST to false");
		}
		}

		// A connection is setup
		apnContext.setState(DctConstants.State.CONNECTED);
		@@ -2923,11 +2906,6 @@ public class DcTracker extends Handler {
		}
		// If APN is still enabled, try to bring it back up automatically
		if (mAttached.get() && apnContext.isReady() && retryAfterDisconnected(apnContext)) {
		try {
		SystemProperties.set(PUPPET_MASTER_RADIO_STRESS_TEST, "false");
		} catch (RuntimeException ex) {
		log("Failed to set PUPPET_MASTER_RADIO_STRESS_TEST to false");
		}
		// Wait a bit before trying the next APN, so that
		// we're not tying up the RIL command channel.
		// This also helps in any external dependency to turn off the context.