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

Commit 8266e840 authored by Haining Chen's avatar Haining Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix inconsistent permission checks for getSensorPropertiesInternal"

parents ef0d1dbd 2f4aaa47

core/java/android/hardware/face/IFaceService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ interface IFaceService { 
    byte[] dumpSensorServiceStateProto(int sensorId, boolean clearSchedulerBuffer);



    // Retrieve static sensor properties for all face sensors

    @EnforcePermission("MANAGE_BIOMETRIC")

    @EnforcePermission("USE_BIOMETRIC_INTERNAL")

    List<FaceSensorPropertiesInternal> getSensorPropertiesInternal(String opPackageName);



    // Retrieve static sensor properties for the specified sensor

services/core/java/com/android/server/biometrics/sensors/face/FaceService.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class FaceService extends SystemService { 
            return proto.getBytes();

        }



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

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

        @Override // Binder call

        public List<FaceSensorPropertiesInternal> getSensorPropertiesInternal(

                String opPackageName) {