commit f6d960ac31214343309807d1d00bdcc05c9ce31b
author Dmitry Shmidt <dimitrysh@google.com> Thu Feb 01 00:19:30 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 01 00:19:30 2018 +0000
tree 119a4dbabca8a1176008a5fbcdb3d5e8e4336872
parent 64ee868ff3454342f97cc703048b0014a2dfc109
parent 44cacaa8f10ddbe62e96bc5fcc77427ca10ad1c2

Merge "Fix dev settings crash when no OEM unlock service"
am: 44cacaa8f1

Change-Id: Ica60f5411908a8edb34b9263ee8d6d6b4617587b

src/com/android/settings/development/DevelopmentSettings.java

diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 748d452..2d5c70f 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -396,7 +396,9 @@
         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);
@@ -1059,7 +1061,7 @@
     }
 
     private static boolean showEnableOemUnlockPreference(Context context) {
-        return context.getSystemService(Context.OEM_LOCK_SERVICE) != null;
+        return ServiceManager.getService(Context.OEM_LOCK_SERVICE) != null;
     }
 
     /**