From 16cac92f018ecab66a31ed01f27a8c2ad069bd05 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Wed, 12 Jun 2019 12:52:16 -0700 Subject: [PATCH] Do not get setting if targetUserId == UserHandle.USER_NULL Fixes: 135061626 Test: Builds Change-Id: Ib5b667d1de0c112d198db853ed0767fc08e00fbf --- services/core/java/com/android/server/biometrics/Utils.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/biometrics/Utils.java b/services/core/java/com/android/server/biometrics/Utils.java index 5544bede92f22..4fa29ac541f9e 100644 --- a/services/core/java/com/android/server/biometrics/Utils.java +++ b/services/core/java/com/android/server/biometrics/Utils.java @@ -18,10 +18,15 @@ package com.android.server.biometrics; import android.content.Context; import android.os.Build; +import android.os.UserHandle; import android.provider.Settings; public class Utils { public static boolean isDebugEnabled(Context context, int targetUserId) { + if (targetUserId == UserHandle.USER_NULL) { + return false; + } + if (!(Build.IS_ENG || Build.IS_USERDEBUG)) { return false; }