summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/network
diff options
context:
space:
mode:
authorBonian Chen <bonianchen@google.com>2020-05-05 03:17:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-05 03:17:50 +0000
commit7ff5f56ea6253d6767df719090f0b85ae600afbe (patch)
tree43604be2798880fcf6f09def635735ede142a55a /src/com/android/settings/network
parentfb015a3c249ca99775200e0088c1f7b30db4ffb3 (diff)
parenta9de4477e6305c48eda025d1db8c5a7b80d0d98c (diff)
downloadpackages_apps_Settings-7ff5f56ea6253d6767df719090f0b85ae600afbe.tar.gz
packages_apps_Settings-7ff5f56ea6253d6767df719090f0b85ae600afbe.tar.bz2
packages_apps_Settings-7ff5f56ea6253d6767df719090f0b85ae600afbe.zip
Merge "[Settings] Avoid from crash" into rvc-dev
Diffstat (limited to 'src/com/android/settings/network')
-rw-r--r--src/com/android/settings/network/telephony/ApnPreferenceController.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/network/telephony/ApnPreferenceController.java b/src/com/android/settings/network/telephony/ApnPreferenceController.java
index dd681290fc..8442de2a9b 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)