commit f94ff6ce6f01d156f2c434165f85c275a124c61b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 01 23:41:43 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 01 23:41:43 2018 +0000
tree 8c846a4a3ebaf7d55118e8b0b15b229d74a42908
parent 44cacaa8f10ddbe62e96bc5fcc77427ca10ad1c2
parent d39c52f99e26b9d5de18f1115862a93241173549

Merge "Fix memory leak of page "Languages & input""

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 62f285f..40c827b 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -402,7 +402,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);
@@ -1066,7 +1068,7 @@
     }
 
     private static boolean showEnableOemUnlockPreference(Context context) {
-        return context.getSystemService(Context.OEM_LOCK_SERVICE) != null;
+        return ServiceManager.getService(Context.OEM_LOCK_SERVICE) != null;
     }
 
     /**