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

Change-Id: I6b5b51244a5b8fca55671b83974eaff79e943931
This commit is contained in:
Bonian Chen
2020-05-05 04:11:09 +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)