Merge "[automerger skipped] Merge "Remove SMSDispatcher.sendData() from greylist as it's params changed" am: fe86a00845 am: c911bc365e am: 910c491792 -s ours am skip reason: change_id Ib70dd739d8067ca2e37f0dbc6c48a2d625935a4b with SHA1 cd0d609f75 is in history"
diff --git a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
index d787758..ebb9e06 100644
--- a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
+++ b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
@@ -43,6 +43,7 @@
import android.os.IHwBinder;
import android.os.IRemoteCallback;
import android.os.PowerManager;
+import android.os.Process;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemClock;
@@ -958,6 +959,10 @@
int pid, int userId) {
checkUseBiometricPermission();
+
+ if (Binder.getCallingUid() == Process.SYSTEM_UID) {
+ return true; // System process (BiometricService, etc) is always allowed
+ }
if (isKeyguard(opPackageName)) {
return true; // Keyguard is always allowed
}