Merge "[Settings] Avoid from crash" am: fdb57510cd

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385026

Change-Id: Ib83865b6248d6b3dcc4426a0a9729c8a76c1c0c2
This commit is contained in:
Bonian Chen
2020-08-03 09:06:05 +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)