Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bc34e07 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Added command line tool to enable/disable new data stack" am: 81185e2b am: b7640c40 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2052036



Change-Id: I687365ab5a24f43a47d850f6682653830c0e150d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccd36dfa b7640c40

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) {