Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e am: d389bc1cb4

Change-Id: I8aafe87a3a63d70c1be15e752fd6e79f6fff3755
2020-05-05 04:09:05 +00:00
parent fa1927aaf0 d389bc1cb4
commit ec277b8169
1 changed files with 3 additions and 0 deletions
--- a/src/com/android/settings/network/telephony/ApnPreferenceController.java
+++ b/src/com/android/settings/network/telephony/ApnPreferenceController.java
@@ -93,6 +93,9 @@ public class ApnPreferenceController extends TelephonyBasePreferenceController i
    @Override
    public void updateState(Preference preference) {
        super.updateState(preference);
+        if (mPreference == null) {
+            return;
+        }
        ((RestrictedPreference) mPreference).setDisabledByAdmin(
                MobileNetworkUtils.isDpcApnEnforced(mContext)
                        ? RestrictedLockUtilsInternal.getDeviceOwner(mContext)