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

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

+8 −4

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

		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() {
		return mIccRecords.get();
		}
		@@ -611,6 +615,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		// Initialize SMS stats
		mSmsStats = new SmsStats(this);

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

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

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