From c89c3b8216ebc0a8f38aac29374f0d243d628dc6 Mon Sep 17 00:00:00 2001
From: Valentin Iftime <valiiftime@google.com>
Date: Wed, 5 Feb 2020 14:13:08 +0100
Subject: [PATCH] Check for FEATURE_TELEPHONY before clearing APNs

Do not clear override APNs for devices without FEATURE_TELEPHONY

Test: atest DeviceOwnerTest
Bug: 148928926
Change-Id: I2b6c426c4a88ea7260910b48327a408ab9ee0466
---
 .../server/devicepolicy/DevicePolicyManagerService.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 28e44f14d839d..3bd0297501fd3 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -8520,6 +8520,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
     }
 
     private void clearOverrideApnUnchecked() {
+        if (!mHasTelephonyFeature) {
+            return;
+        }
         // Disable Override APNs and remove them from database.
         setOverrideApnsEnabledUnchecked(false);
         final List<ApnSetting> apns = getOverrideApnsUnchecked();