IFAAService: Move from FOD to UDFPS naming convention

Change-Id: I21aaa718fa33a948a093ac6bb75ac0d63caad213
This commit is contained in:
Bruno Martins 2022-05-05 17:50:01 +01:00
parent aaa03ac503
commit 3b1a4a69d1

View File

@ -37,8 +37,6 @@ public class IfaaService extends Service {
private static final int ACTIVITY_START_SUCCESS = 0;
private static final int ACTIVITY_START_FAILED = -1;
private static boolean sIsFod = SystemProperties.getBoolean("ro.hardware.fp.fod", false);
private IMlipayService mMlipayService = null;
private final IBinder mIFAABinder = new IfaaServiceStub(this);
@ -57,7 +55,8 @@ public class IfaaService extends Service {
ifaaProp & AUTH_TYPE_IRIS :
ifaaProp & (AUTH_TYPE_FINGERPRINT | AUTH_TYPE_IRIS);
if ((res & AUTH_TYPE_FINGERPRINT) == AUTH_TYPE_FINGERPRINT && sIsFod) {
if ((res & AUTH_TYPE_FINGERPRINT) == AUTH_TYPE_FINGERPRINT &&
SystemProperties.getBoolean("ro.hardware.fp.udfps", false)) {
res |= AUTH_TYPE_OPTICAL_FINGERPRINT;
}
@ -179,8 +178,8 @@ public class IfaaService extends Service {
private String initExtString() {
JSONObject obj = new JSONObject();
JSONObject keyInfo = new JSONObject();
String xy = SystemProperties.get("persist.vendor.sys.fp.fod.location.X_Y", "");
String wh = SystemProperties.get("persist.vendor.sys.fp.fod.size.width_height", "");
String xy = SystemProperties.get("persist.vendor.sys.fp.udfps.location.X_Y", "");
String wh = SystemProperties.get("persist.vendor.sys.fp.udfps.size.width_height", "");
try {
if (!validateVal(xy) || !validateVal(wh)) {
Log.e(LOG_TAG, "initExtString: invalidate, xy: " + xy + ", wh: " + wh);