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

Commit c89c3b82 authored by Valentin Iftime's avatar Valentin Iftime
Browse files

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
parent 374ba3fc

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -8520,6 +8520,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
    }

    }

















    private void clearOverrideApnUnchecked() {







    private void clearOverrideApnUnchecked() {














        if (!mHasTelephonyFeature) {














            return;














        }











        // Disable Override APNs and remove them from database.







        // Disable Override APNs and remove them from database.











        setOverrideApnsEnabledUnchecked(false);







        setOverrideApnsEnabledUnchecked(false);











        final List<ApnSetting> apns = getOverrideApnsUnchecked();







        final List<ApnSetting> apns = getOverrideApnsUnchecked();