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

Commit 1401d89c authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "DevicePolicyManager: Skip clearing APN before boot completed" into udc-dev am: 173ce5c4 

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



Change-Id: Ie051a216d1b1aedff45cf5a276f6c9faea49b2d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a554369b 173ce5c4

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+8 −1
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ import android.util.AtomicFile; 
import android.util.DebugUtils;

import android.util.IndentingPrintWriter;

import android.util.IntArray;

import android.util.Log;

import android.util.Pair;

import android.util.Slog;

import android.util.SparseArray;
@@ -489,6 +488,7 @@ import com.android.server.LockGuard; 
import com.android.server.PersistentDataBlockManagerInternal;

import com.android.server.SystemServerInitThreadPool;

import com.android.server.SystemService;

import com.android.server.SystemServiceManager;

import com.android.server.devicepolicy.ActiveAdmin.TrustAgentInfo;

import com.android.server.inputmethod.InputMethodManagerInternal;

import com.android.server.net.NetworkPolicyManagerInternal;
@@ -10071,6 +10071,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        if (!mHasTelephonyFeature) {

            return;

        }

        if (!LocalServices.getService(SystemServiceManager.class).isBootCompleted()) {

            Slogf.i(LOG_TAG, "Skip clearing managed profile Apn before boot completed");

            // Cannot talk to APN content provider before system boots

            // Ideally we should delay the cleanup post boot_completed, not just

            // skipping  it altogether.

            return;

        }

        final List<ApnSetting> apns = getOverrideApnsUnchecked();

        for (ApnSetting apn : apns) {

            if (apn.getApnTypeBitmask() == ApnSetting.TYPE_ENTERPRISE) {