From fdb3a35efe1a055269cc42f176f569ad99882b15 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Mon, 4 May 2020 10:52:40 +0800
Subject: [PATCH] [Settings] Avoid from crash

Avoid from crash when updateState() performed before
displayPreference().

Bug: 141833767
Test: make RunSettingsRoboTests -j
ROBOTEST_FILTER=ApnPreferenceControllerTest

Merged-In: I4008010077c61930487fef01af306ccdfd69e38f
Change-Id: Ic6421532d5435a577f765f23a69681bb9b8a1bd0
---
 .../settings/network/telephony/ApnPreferenceController.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/network/telephony/ApnPreferenceController.java b/src/com/android/settings/network/telephony/ApnPreferenceController.java
index dd681290fc8..8442de2a9b4 100644
--- 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)