Merge "Merge "Add Telecom command for setting connectionservice filter" am: 25f4dca660 am: 05e03e8c0c am: 4d4dc1165a am: 7acb9ff577"
diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java
index 7302b98..027170a 100644
--- a/services/core/java/com/android/server/biometrics/BiometricService.java
+++ b/services/core/java/com/android/server/biometrics/BiometricService.java
@@ -25,7 +25,6 @@
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_NONE;
import android.app.ActivityManager;
-import android.app.AppOpsManager;
import android.app.IActivityManager;
import android.app.KeyguardManager;
import android.app.UserSwitchObserver;
@@ -257,7 +256,6 @@
private final Injector mInjector;
@VisibleForTesting
final IBiometricService.Stub mImpl;
- private final AppOpsManager mAppOps;
private final boolean mHasFeatureFingerprint;
private final boolean mHasFeatureIris;
private final boolean mHasFeatureFace;
@@ -864,14 +862,6 @@
}
}
- private void checkAppOp(String opPackageName, int callingUid) {
- if (mAppOps.noteOp(AppOpsManager.OP_USE_BIOMETRIC, callingUid,
- opPackageName) != AppOpsManager.MODE_ALLOWED) {
- Slog.w(TAG, "Rejecting " + opPackageName + "; permission denied");
- throw new SecurityException("Permission denied");
- }
- }
-
private void checkInternalPermission() {
getContext().enforceCallingOrSelfPermission(USE_BIOMETRIC_INTERNAL,
"Must have USE_BIOMETRIC_INTERNAL permission");
@@ -942,7 +932,6 @@
mInjector = injector;
mImpl = new BiometricServiceWrapper();
- mAppOps = context.getSystemService(AppOpsManager.class);
mEnabledOnKeyguardCallbacks = new ArrayList<>();
mSettingObserver = mInjector.getSettingObserver(context, mHandler,
mEnabledOnKeyguardCallbacks);