diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-05-13 13:14:19 +0100 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-12 09:55:13 +0000 |
| commit | 8a4b671f014c0ecf73742296d39ec877aeec651a (patch) | |
| tree | 8891f72d450df8fd7cb52908a448926d73b20f03 | |
| parent | 236b44274ebd1d7e3c706a24fd2a83d534d68ab0 (diff) | |
| download | base-8a4b671f014c0ecf73742296d39ec877aeec651a.tar.gz | |
[RESTRICT AUTOMERGE] Fix NullPointerException when mLockPatternUtils is not set.
Test: atest LockTaskControllerTest
Bug: 132593073
Change-Id: I1bfacd5992569d67cdaa526b18d1c426a366babb
(cherry picked from commit fa1b986746ad7d9ebab6a34a0bfafd0a93267d5b)
| -rw-r--r-- | services/core/java/com/android/server/am/LockTaskController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/LockTaskController.java b/services/core/java/com/android/server/am/LockTaskController.java index ab67b8a3f534..bd0506b4b91e 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 @@ 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); } } |