Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rubin Xu
2023-05-11 11:41:07 +00:00
committed by Android (Google) Code Review
parent 08d9484b49 d75930cb1f
commit 173ce5c44d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -446,7 +446,6 @@ import android.util.AtomicFile;
import android.util.DebugUtils; import android.util.DebugUtils;
import android.util.IndentingPrintWriter; import android.util.IndentingPrintWriter;
import android.util.IntArray; import android.util.IntArray;
import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.util.Slog; import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
@@ -489,6 +488,7 @@ import com.android.server.LockGuard;
import com.android.server.PersistentDataBlockManagerInternal; import com.android.server.PersistentDataBlockManagerInternal;
import com.android.server.SystemServerInitThreadPool; import com.android.server.SystemServerInitThreadPool;
import com.android.server.SystemService; import com.android.server.SystemService;
import com.android.server.SystemServiceManager;
import com.android.server.devicepolicy.ActiveAdmin.TrustAgentInfo; import com.android.server.devicepolicy.ActiveAdmin.TrustAgentInfo;
import com.android.server.inputmethod.InputMethodManagerInternal; import com.android.server.inputmethod.InputMethodManagerInternal;
import com.android.server.net.NetworkPolicyManagerInternal; import com.android.server.net.NetworkPolicyManagerInternal;
@@ -10071,6 +10071,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
if (!mHasTelephonyFeature) { if (!mHasTelephonyFeature) {
return; 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(); final List<ApnSetting> apns = getOverrideApnsUnchecked();
for (ApnSetting apn : apns) { for (ApnSetting apn : apns) {
if (apn.getApnTypeBitmask() == ApnSetting.TYPE_ENTERPRISE) { if (apn.getApnTypeBitmask() == ApnSetting.TYPE_ENTERPRISE) {