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

Commit 59eb9e9d authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "RadioInfo: Disable ims provisioning switches in USER-build" 

am: 61c5a296

Change-Id: I3211ffb7e25af0e60ac20175bf86466ee4c85998
parents d77dfa20 61c5a296

src/com/android/settings/RadioInfo.java

+9 −7
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.net.NetworkRequest; 
import android.net.TrafficStats;

import android.net.Uri;

import android.os.AsyncResult;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Message;
@@ -1364,25 +1365,26 @@ public class RadioInfo extends Activity { 
        imsVolteProvisionedSwitch.setOnCheckedChangeListener(null);

        imsVolteProvisionedSwitch.setChecked(isImsVolteProvisioned());

        imsVolteProvisionedSwitch.setOnCheckedChangeListener(mImsVolteCheckedChangeListener);

        imsVolteProvisionedSwitch.setEnabled(

                mImsManager.isVolteEnabledByPlatform(phone.getContext()));

        imsVolteProvisionedSwitch.setEnabled(!Build.IS_USER

                && mImsManager.isVolteEnabledByPlatform(phone.getContext()));



        imsVtProvisionedSwitch.setOnCheckedChangeListener(null);

        imsVtProvisionedSwitch.setChecked(isImsVtProvisioned());

        imsVtProvisionedSwitch.setOnCheckedChangeListener(mImsVtCheckedChangeListener);

        imsVtProvisionedSwitch.setEnabled(

            mImsManager.isVtEnabledByPlatform(phone.getContext()));

        imsVtProvisionedSwitch.setEnabled(!Build.IS_USER

                && mImsManager.isVtEnabledByPlatform(phone.getContext()));



        imsWfcProvisionedSwitch.setOnCheckedChangeListener(null);

        imsWfcProvisionedSwitch.setChecked(isImsWfcProvisioned());

        imsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);

        imsWfcProvisionedSwitch.setEnabled(

            mImsManager.isWfcEnabledByPlatform(phone.getContext()));

        imsWfcProvisionedSwitch.setEnabled(!Build.IS_USER

                && mImsManager.isWfcEnabledByPlatform(phone.getContext()));



        eabProvisionedSwitch.setOnCheckedChangeListener(null);

        eabProvisionedSwitch.setChecked(isEabProvisioned());

        eabProvisionedSwitch.setOnCheckedChangeListener(mEabCheckedChangeListener);

        eabProvisionedSwitch.setEnabled(isEabEnabledByPlatform(phone.getContext()));

        eabProvisionedSwitch.setEnabled(!Build.IS_USER

                && isEabEnabledByPlatform(phone.getContext()));

    }



    OnClickListener mDnsCheckButtonHandler = new OnClickListener() {