PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Settings] Avoid from crash

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

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

Merged-In: I4008010077c61930487fef01af306ccdfd69e38f
Change-Id: Ic6421532d5435a577f765f23a69681bb9b8a1bd0
This commit is contained in:
Bonian Chen
2020-05-04 10:52:40 +08:00
parent 7df1fb2af1
commit fdb3a35efe
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/telephony/ApnPreferenceController.java
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)