From c888e19c87fcc924585a7d5c757bc16a6f32551b Mon Sep 17 00:00:00 2001 From: Sreekanth Badida Date: Mon, 5 Feb 2018 17:18:40 +0100 Subject: [PATCH] RadioInfo: Disable ims provisioning switches in USER-build Disables provisioning switches for Ims-related features in the RadioInfo dialog when using USER-build. This prevents the user from circumventing ims provisioning checks. Bug: 78372174 Test: Manual Change-Id: If538d7ed56ca53ae6a8be31ddf374d9a15a8fdec --- src/com/android/settings/RadioInfo.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java index ee20c586e9b..5101fe8ec54 100644 --- a/src/com/android/settings/RadioInfo.java +++ b/src/com/android/settings/RadioInfo.java @@ -36,6 +36,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; @@ -1358,25 +1359,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() {