Merge "Added command line tool to enable/disable new data stack" (f46c39a1) · Commits · e / os / android_frameworks_opt_telephony

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

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -467,6 +467,10 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {

	protected LinkBandwidthEstimator mLinkBandwidthEstimator;		protected LinkBandwidthEstimator mLinkBandwidthEstimator;

			// TODO: Temp code. Use cl/399526916 for future canary process. After rolling out to 100%
			// dogfooders, the code below should be completely removed.
			private final boolean mNewDataStackEnabled;

	public IccRecords getIccRecords() {		public IccRecords getIccRecords() {
	return mIccRecords.get();		return mIccRecords.get();
	}		}
	@@ -608,6 +612,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
	// Initialize SMS stats		// Initialize SMS stats
	mSmsStats = new SmsStats(this);		mSmsStats = new SmsStats(this);

			mNewDataStackEnabled = false; /*(Boolean.parseBoolean(DeviceConfig.getProperty(
			DeviceConfig.NAMESPACE_TELEPHONY,"new_telephony_data_enabled"));*/

	if (getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {		if (getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
	return;		return;
	}		}
	@@ -4900,10 +4907,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
	// TODO: Temp code. Use cl/399526916 for future canary process. After rolling out to 100%		// TODO: Temp code. Use cl/399526916 for future canary process. After rolling out to 100%
	// dogfooders, the code below should be completely removed.		// dogfooders, the code below should be completely removed.
	public boolean isUsingNewDataStack() {		public boolean isUsingNewDataStack() {
	return false;		return mNewDataStackEnabled;
	/*String configValue = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_TELEPHONY,
	"new_telephony_data_enabled");
	return Boolean.parseBoolean(configValue);*/
	}		}

	public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {