Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ac3120a authored by Dmitry Shmidt's avatar Dmitry Shmidt Committed by android-build-merger
Browse files

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

am: f6d960ac

Change-Id: I536daa3948be136524e35e35448df09eaa6ad9da
parents b9af110c f6d960ac

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

+4 −2
Original line number Diff line number Diff line
@@ -395,7 +395,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        mBackupManager = IBackupManager.Stub.asInterface(

                ServiceManager.getService(Context.BACKUP_SERVICE));

        mWebViewUpdateService = WebViewFactory.getUpdateService();

        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 @@ 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;

    }



    /**