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

Commit 15dcf700 authored by Ayush Sharma's avatar Ayush Sharma Committed by Automerger Merge Worker
Browse files

Merge "Add flag for switch to managed profile dialog" into udc-dev am: cd847010 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21508430



Change-Id: I5e81c7a638512431d70fa029de221e61acf55849
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c91498e5 cd847010

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

+9 −0
Original line number Diff line number Diff line
@@ -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.

     *