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

Merge "Fix dev settings crash when no OEM unlock service"

Browse Source
This commit is contained in:
Dmitry Shmidt
2018-01-31 23:46:54 +00:00
committed by Gerrit Code Review
parent 7a65c7f279 8337ad3be6
commit 44cacaa8f1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -402,7 +402,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mBackupManager = IBackupManager.Stub.asInterface(
ServiceManager.getService(Context.BACKUP_SERVICE));
mWebViewUpdateService = WebViewFactory.getUpdateService();
mOemLockManager = (OemLockManager) getSystemService(Context.OEM_LOCK_SERVICE);
if (showEnableOemUnlockPreference(getContext())) {
mOemLockManager = (OemLockManager) getSystemService(Context.OEM_LOCK_SERVICE);
}
mTelephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
mUm = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -1066,7 +1068,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
}
private static boolean showEnableOemUnlockPreference(Context context) {
return context.getSystemService(Context.OEM_LOCK_SERVICE) != null;
return ServiceManager.getService(Context.OEM_LOCK_SERVICE) != null;
}
/**