Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53ac9995 authored by Matt Gilbride's avatar Matt Gilbride Committed by Android (Google) Code Review
Browse files

Merge "services.core.unboosted - call PermissionEnforcer helper on methods... 

Merge "services.core.unboosted - call PermissionEnforcer helper on methods annotated with @EnforcePermission"
parents 25926239 19b835ab

services/core/java/com/android/server/biometrics/BiometricService.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -780,6 +780,8 @@ public class BiometricService extends SystemService { 
        @Override // Binder call

        @Override // Binder call

        public void resetLockout(

        public void resetLockout(

                int userId, byte[] hardwareAuthToken) {

                int userId, byte[] hardwareAuthToken) {

            super.resetLockout_enforcePermission();



            Slog.d(TAG, "resetLockout(userId=" + userId

            Slog.d(TAG, "resetLockout(userId=" + userId

                    + ", hat=" + (hardwareAuthToken == null ? "null " : "present") + ")");

                    + ", hat=" + (hardwareAuthToken == null ? "null " : "present") + ")");

            mBiometricContext.getAuthSessionCoordinator()

            mBiometricContext.getAuthSessionCoordinator()

services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -942,6 +942,8 @@ public class FingerprintService extends SystemService { 
        @android.annotation.EnforcePermission(android.Manifest.permission.USE_BIOMETRIC_INTERNAL)

        @android.annotation.EnforcePermission(android.Manifest.permission.USE_BIOMETRIC_INTERNAL)

        @Override

        @Override

        public void setUdfpsOverlay(@NonNull IUdfpsOverlay controller) {

        public void setUdfpsOverlay(@NonNull IUdfpsOverlay controller) {

            super.setUdfpsOverlay_enforcePermission();



            for (ServiceProvider provider : mRegistry.getProviders()) {

            for (ServiceProvider provider : mRegistry.getProviders()) {

                provider.setUdfpsOverlay(controller);

                provider.setUdfpsOverlay(controller);

            }

            }

services/core/java/com/android/server/input/InputManagerService.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -2677,6 +2677,8 @@ public class InputManagerService extends IInputManager.Stub 
    @EnforcePermission(Manifest.permission.BLUETOOTH)

    @EnforcePermission(Manifest.permission.BLUETOOTH)

    @Override

    @Override

    public String getInputDeviceBluetoothAddress(int deviceId) {

    public String getInputDeviceBluetoothAddress(int deviceId) {

        super.getInputDeviceBluetoothAddress_enforcePermission();



        return mNative.getBluetoothAddress(deviceId);

        return mNative.getBluetoothAddress(deviceId);

    }

    }