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

Commit 5b5ed6f1 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Added a temp flag for feature canarying" am: db71841d 

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

Change-Id: Icd017f02a89029dc1f41d5c70e39d6b0790cec57
parents 3883988d db71841d

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

+13 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.os.SystemClock; 
import android.os.SystemProperties;

import android.os.WorkSource;

import android.preference.PreferenceManager;

import android.provider.DeviceConfig;

import android.sysprop.TelephonyProperties;

import android.telecom.VideoProfile;

import android.telephony.AccessNetworkConstants;
@@ -4916,6 +4917,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        pw.println(" needsOtaServiceProvisioning=" + needsOtaServiceProvisioning());

        pw.println(" isInEmergencySmsMode=" + isInEmergencySmsMode());

        pw.println(" isEcmCanceledForEmergency=" + isEcmCanceledForEmergency());

        pw.println(" isUsingNewDataStack=" + isUsingNewDataStack());

        pw.println(" service state=" + getServiceState());

        pw.flush();

        pw.println("++++++++++++++++++++++++++++++++");
@@ -5117,4 +5119,15 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    public boolean isAllowedNetworkTypesLoadedFromDb() {

        return mIsAllowedNetworkTypesLoadedFromDb;

    }



    /**

     * @return {@code true} if using the new telephony data stack. See go/atdr for the design.

     */

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

        String configValue = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_TELEPHONY,

                "new_telephony_data_enabled");

        return configValue != null && Boolean.parseBoolean(configValue);

    }

}