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

Commit 29bb82a1 authored by Jonathan Scott's avatar Jonathan Scott Committed by android-build-merger
Browse files

Merge "Merge "Fix NullPointerException when mLockPatternUtils is not set."... 

Merge "Merge "Fix NullPointerException when mLockPatternUtils is not set." into qt-dev am: d533c483 am: a561b988" into qt-r1-dev-plus-aosp
am: dea46031

Change-Id: I957a4c4d8a7a8e671520c5a033ae2eebf7e75561
parents 440fb2da dea46031

services/core/java/com/android/server/wm/LockTaskController.java

+1 −1
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ public class LockTaskController { 
        } catch (Settings.SettingNotFoundException e) {

            // Log to SafetyNet for b/127605586

            android.util.EventLog.writeEvent(0x534e4554, "127605586", -1, "");

            return mLockPatternUtils.isSecure(USER_CURRENT);

            return getLockPatternUtils().isSecure(USER_CURRENT);

        }

    }