diff options
author | Jonathan Scott <scottjonathan@google.com> | 2019-05-13 13:14:19 +0100 |
---|---|---|
committer | Nikoli Cartagena <dargeren@google.com> | 2019-06-10 18:52:34 -0700 |
commit | fcc855f0c1f39dc38ab6faef56265c77b7b997be (patch) | |
tree | efd102e3a7b379157afee7a158a5101681c15f3c | |
parent | 2c028321d801c08fe169fc44e9a0c43f1eb84260 (diff) | |
download | base-fcc855f0c1f39dc38ab6faef56265c77b7b997be.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); } } |