Merge "Do not get setting if targetUserId == UserHandle.USER_NULL" into qt-r1-dev

am: a9247e4913 Change-Id: I09700bf5955f30ca54d5c851ff5fa1dd1487823b
2019-06-12 13:31:55 -07:00
parent 0c6aeb6b4e a9247e4913
commit bbb483bbac
1 changed files with 5 additions and 0 deletions
--- 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;
        }