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

Commit 7edbab64 authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

Assume convenience for biometrics not configured in R 

This change restores R biometric behavior for devices that:
- Declare FEATURE_FINGERPRINT or FEATURE_FACE
- Have an empty config_biometric_sensors in config.xml
- Report ro.board.[first_]api_level as 30 (R)

The behavior is restored by assuming that the device has biometrics
sensors of the convenience strength class.

Bug: 200005662
Test: blueline + R vendor w/o the config + S GSI
Change-Id: I2ae8b746bb5247b5bb6ef9929b3a11ad5403ca48
parent 0a426db7

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

+39 −1
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ import android.os.Build; 
import android.os.IBinder;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings;

import android.util.Slog;

import android.util.Slog;
@@ -71,6 +72,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.server.SystemService;

import com.android.server.SystemService;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.List;





/**

/**
@@ -82,6 +84,8 @@ public class AuthService extends SystemService { 
    private static final String SETTING_HIDL_DISABLED =

    private static final String SETTING_HIDL_DISABLED =

            "com.android.server.biometrics.AuthService.hidlDisabled";

            "com.android.server.biometrics.AuthService.hidlDisabled";

    private static final int DEFAULT_HIDL_DISABLED = 0;

    private static final int DEFAULT_HIDL_DISABLED = 0;

    private static final String SYSPROP_FIRST_API_LEVEL = "ro.board.first_api_level";

    private static final String SYSPROP_API_LEVEL = "ro.board.api_level";





    private final Injector mInjector;

    private final Injector mInjector;
@@ -624,7 +628,16 @@ public class AuthService extends SystemService { 




        final SensorConfig[] hidlConfigs;

        final SensorConfig[] hidlConfigs;

        if (!mInjector.isHidlDisabled(getContext())) {

        if (!mInjector.isHidlDisabled(getContext())) {

            final String[] configStrings = mInjector.getConfiguration(getContext());

            final int firstApiLevel = SystemProperties.getInt(SYSPROP_FIRST_API_LEVEL, 0);

            final int apiLevel = SystemProperties.getInt(SYSPROP_API_LEVEL, firstApiLevel);

            String[] configStrings = mInjector.getConfiguration(getContext());

            if (configStrings.length == 0 && apiLevel == Build.VERSION_CODES.R) {

                // For backwards compatibility with R where biometrics could work without being

                // configured in config_biometric_sensors. In the absence of a vendor provided

                // configuration, we assume the weakest biometric strength (i.e. convenience).

                Slog.w(TAG, "Found R vendor partition without config_biometric_sensors");

                configStrings = generateRSdkCompatibleConfiguration();

            }

            hidlConfigs = new SensorConfig[configStrings.length];

            hidlConfigs = new SensorConfig[configStrings.length];

            for (int i = 0; i < configStrings.length; ++i) {

            for (int i = 0; i < configStrings.length; ++i) {

                hidlConfigs[i] = new SensorConfig(configStrings[i]);

                hidlConfigs[i] = new SensorConfig(configStrings[i]);
@@ -639,6 +652,31 @@ public class AuthService extends SystemService { 
        mInjector.publishBinderService(this, mImpl);

        mInjector.publishBinderService(this, mImpl);

    }

    }





    /**

     * Generates an array of string configs with entries that correspond to the biometric features

     * declared on the device. Returns an empty array if no biometric features are declared.

     * Biometrics are assumed to be of the weakest strength class, i.e. convenience.

     */

    private @NonNull String[] generateRSdkCompatibleConfiguration() {

        final PackageManager pm = getContext().getPackageManager();

        final ArrayList<String> modalities = new ArrayList<>();

        if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {

            modalities.add(String.valueOf(BiometricAuthenticator.TYPE_FINGERPRINT));

        }

        if (pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {

            modalities.add(String.valueOf(BiometricAuthenticator.TYPE_FACE));

        }

        final String strength = String.valueOf(Authenticators.BIOMETRIC_CONVENIENCE);

        final String[] configStrings = new String[modalities.size()];

        for (int i = 0; i < modalities.size(); ++i) {

            final String id = String.valueOf(i);

            final String modality = modalities.get(i);

            configStrings[i] = String.join(":" /* delimiter */, id, modality, strength);

        }

        Slog.d(TAG, "Generated config_biometric_sensors: " + Arrays.toString(configStrings));

        return configStrings;

    }



    /**

    /**

     * Registers HIDL and AIDL authenticators for all of the available modalities.

     * Registers HIDL and AIDL authenticators for all of the available modalities.

     *

     *