From 8337ad3be6bf2211a22d9e2f6bf80a227dc469b8 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 31 Jan 2018 14:55:58 -0500 Subject: [PATCH] Fix dev settings crash when no OEM unlock service Test: Open dev settings, no crash Change-Id: I028c52ee58d7262e9fbd015289d7848b397c82e3 --- .../android/settings/development/DevelopmentSettings.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java index 62f285f215d..40c827b532a 100644 --- a/src/com/android/settings/development/DevelopmentSettings.java +++ b/src/com/android/settings/development/DevelopmentSettings.java @@ -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; } /**