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

Change-Id: Iadad44a8f094c5e589409434dfc5ff54a9dc283b
This commit is contained in:
Bonian Chen
2020-05-05 03:33:29 +00:00
committed by Automerger Merge Worker

View File

@@ -93,6 +93,9 @@ public class ApnPreferenceController extends TelephonyBasePreferenceController i
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
super.updateState(preference); super.updateState(preference);
if (mPreference == null) {
return;
}
((RestrictedPreference) mPreference).setDisabledByAdmin( ((RestrictedPreference) mPreference).setDisabledByAdmin(
MobileNetworkUtils.isDpcApnEnforced(mContext) MobileNetworkUtils.isDpcApnEnforced(mContext)
? RestrictedLockUtilsInternal.getDeviceOwner(mContext) ? RestrictedLockUtilsInternal.getDeviceOwner(mContext)