commit 2ac3120a0161f85daa7a267a4e373373340afb12
author Dmitry Shmidt <dimitrysh@google.com> Thu Feb 01 00:29:23 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 01 00:29:23 2018 +0000
tree 4abd10b0d80456268852ac935dd11518aaffb229
parent b9af110c03ba6b2f2033a8c747d878083ee3a26b
parent f6d960ac31214343309807d1d00bdcc05c9ce31b

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

Change-Id: I536daa3948be136524e35e35448df09eaa6ad9da

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 ff5bc18..6720552 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -395,7 +395,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);
@@ -1054,7 +1056,7 @@
     }
 
     private static boolean showEnableOemUnlockPreference(Context context) {
-        return context.getSystemService(Context.OEM_LOCK_SERVICE) != null;
+        return ServiceManager.getService(Context.OEM_LOCK_SERVICE) != null;
     }
 
     /**