| commit | 3c09ad74e8eee24324d7de567e4b03674c48f88d | [log] [tgz] |
|---|---|---|
| author | Jonathan Scott <scottjonathan@google.com> | Mon May 13 13:14:19 2019 +0100 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Tue Jun 11 21:04:13 2019 +0000 |
| tree | d87442a0371935311bf9da18241dcfd5d7b5154d | |
| parent | d275736da9f3081da8bdd419c24e0437bdcf160e [diff] |
[RESTRICT AUTOMERGE] Fix NullPointerException when mLockPatternUtils is not set. Test: atest LockTaskControllerTest Bug: 132593073 Change-Id: I1bfacd5992569d67cdaa526b18d1c426a366babb (cherry picked from commit fa1b986746ad7d9ebab6a34a0bfafd0a93267d5b)
diff --git a/services/core/java/com/android/server/am/LockTaskController.java b/services/core/java/com/android/server/am/LockTaskController.java index ab67b8a..bd0506b4 100644 --- a/services/core/java/com/android/server/am/LockTaskController.java +++ b/services/core/java/com/android/server/am/LockTaskController.java
@@ -794,7 +794,7 @@ } 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); } }