diff --git a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java index cbac34f50a961..0325ba648af61 100644 --- a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java +++ b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java @@ -31,6 +31,7 @@ import android.os.RemoteException; import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; +import android.provider.DeviceConfig; import android.telephony.SubscriptionManager; import android.telephony.TelephonyFrameworkInitializer; import android.telephony.TelephonyManager; @@ -258,6 +259,9 @@ public final class TelephonyUtils { */ public static void showErrorIfSubscriptionAssociatedWithManagedProfile(Context context, int subId) { + if (!isSwitchToManagedProfileDialogFlagEnabled()) { + return; + } final long token = Binder.clearCallingIdentity(); try { SubscriptionManager subscriptionManager = context.getSystemService( @@ -286,6 +290,11 @@ public final class TelephonyUtils { } } + public static boolean isSwitchToManagedProfileDialogFlagEnabled() { + return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER, + "enable_switch_to_managed_profile_dialog", false); + } + /** * Check if the process with given uid is foreground. *