commit f8658270774a27601edda9377ea6736c3b7062c6
author Ayush Sharma <ayushsha@google.com> Mon Feb 13 14:47:35 2023 +0000
committer Ayush Sharma <ayushsha@google.com> Mon Feb 20 17:35:13 2023 +0000
tree f74f1376cf913bf99bff043fe823d5eba9e1e87d
parent abedcf22434c512b0e14dc3840ccc5b8bfc427c3

Add flag for switch to managed profile dialog

Bug: 258629881
Test: Manual
Change-Id: Ic8c5552409dff213b941510d457058fe398e862d

telephony/common/com/android/internal/telephony/util/TelephonyUtils.java

diff --git a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java
index cbac34f..0325ba6 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.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 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 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.
      *