Revert "sdm660-common: Commonize IFAAManager"
This reverts commit 70e1067023ba68eec69709b15acadb6d83eb5542.
This commit is contained in:
pix106
parent
ef56a15ce0
commit
6e8ca8df17
9 changed files with 499 additions and 0 deletions
29
org.ifaa.android.manager/Android.bp
Normal file
29
org.ifaa.android.manager/Android.bp
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
/*
|
||||
* Copyright (C) 2017-2019 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
java_library {
|
||||
name: "org.ifaa.android.manager",
|
||||
installable: true,
|
||||
srcs: [
|
||||
"src/**/*.java",
|
||||
"src/**/I*.aidl",
|
||||
],
|
||||
aidl: {
|
||||
local_include_dirs: ["src"],
|
||||
},
|
||||
libs: [ "unsupportedappusage" ],
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
package org.ifaa.android.manager;
|
||||
|
||||
import android.compat.annotation.UnsupportedAppUsage;
|
||||
import android.content.Context;
|
||||
import android.os.Build.VERSION;
|
||||
import android.os.SystemProperties;
|
||||
|
||||
public abstract class IFAAManager {
|
||||
private static final int IFAA_VERSION_V2 = 2;
|
||||
private static final int IFAA_VERSION_V3 = 3;
|
||||
private static final int IFAA_VERSION_V4 = 4;
|
||||
static int sIfaaVer;
|
||||
static boolean sIsFod = SystemProperties.getBoolean("ro.hardware.fp.fod", false);
|
||||
|
||||
/**
|
||||
* 返回手机系统上支持的校验方式，目前IFAF协议1.0版本指纹为0x01、虹膜为0x02
|
||||
*/
|
||||
@UnsupportedAppUsage
|
||||
public abstract int getSupportBIOTypes(Context context);
|
||||
|
||||
/**
|
||||
* 启动系统的指纹/虹膜管理应用界面，让用户进行指纹录入。指纹录入是在系统的指纹管理应用中实现的，
|
||||
* 本函数的作用只是将指纹管理应用运行起来，直接进行页面跳转，方便用户录入。
|
||||
* @param context
|
||||
* @param authType 生物特征识别类型，指纹为1，虹膜为2
|
||||
* @return 0，成功启动指纹管理应用；-1，启动指纹管理应用失败。
|
||||
*/
|
||||
@UnsupportedAppUsage
|
||||
public abstract int startBIOManager(Context context, int authType);
|
||||
|
||||
/**
|
||||
* 通过ifaateeclient的so文件实现REE到TA的通道
|
||||
* @param context
|
||||
* @param param 用于传输到IFAA TA的数据buffer
|
||||
* @return IFAA TA返回给REE数据buffer
|
||||
*/
|
||||
@UnsupportedAppUsage
|
||||
public native byte[] processCmd(Context context, byte[] param);
|
||||
|
||||
/**
|
||||
* 获取设备型号，同一款机型型号需要保持一致
|
||||
*/
|
||||
@UnsupportedAppUsage
|
||||
public abstract String getDeviceModel();
|
||||
|
||||
/**
|
||||
* 获取IFAAManager接口定义版本，目前为1
|
||||
*/
|
||||
@UnsupportedAppUsage
|
||||
public abstract int getVersion();
|
||||
|
||||
/**
|
||||
* load so to communicate from REE to TEE
|
||||
*/
|
||||
static {
|
||||
sIfaaVer = 1;
|
||||
if (VERSION.SDK_INT >= 28) {
|
||||
sIfaaVer = 4;
|
||||
} else if (sIsFod) {
|
||||
sIfaaVer = 3;
|
||||
} else if (VERSION.SDK_INT >= 24) {
|
||||
sIfaaVer = 2;
|
||||
} else {
|
||||
System.loadLibrary("teeclientjni");//teeclientjni for TA test binary //ifaateeclient
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
package org.ifaa.android.manager;
|
||||
|
||||
import android.compat.annotation.UnsupportedAppUsage;
|
||||
import android.content.Context;
|
||||
|
||||
public class IFAAManagerFactory {
|
||||
@UnsupportedAppUsage
|
||||
public static IFAAManager getIFAAManager(Context context, int authType) {
|
||||
return IFAAManagerImpl.getInstance(context);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,338 @@
|
|||
package org.ifaa.android.manager;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.ServiceConnection;
|
||||
import android.os.Build;
|
||||
import android.os.Build.VERSION;
|
||||
import android.os.HwBinder;
|
||||
import android.os.HwBlob;
|
||||
import android.os.HwParcel;
|
||||
import android.os.IBinder;
|
||||
import android.os.IBinder.DeathRecipient;
|
||||
import android.os.IHwBinder;
|
||||
import android.os.Parcel;
|
||||
import android.os.RemoteException;
|
||||
import android.os.SystemProperties;
|
||||
import android.util.Slog;
|
||||
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class IFAAManagerImpl extends IFAAManagerV4 {
|
||||
private static final boolean DEBUG = false;
|
||||
private static final String TAG = "IfaaManagerImpl";
|
||||
|
||||
private static final int CODE_PROCESS_CMD = 1;
|
||||
private static final int CODE_GETIDLIST_CMD = 2;
|
||||
|
||||
private static final int IFAA_TYPE_FINGER = 1;
|
||||
private static final int IFAA_TYPE_IRIS = (1 << 1);
|
||||
private static final int IFAA_TYPE_SENSOR_FOD = (1 << 4);
|
||||
private static final int IFAA_TYPE_2DFA = (1 << 5);
|
||||
|
||||
private static volatile IFAAManagerImpl INSTANCE = null;
|
||||
|
||||
private static final String INTERFACE_DESCRIPTOR = "vendor.xiaomi.hardware.mlipay@1.0::IMlipayService";
|
||||
private static final String SERVICE_NAME = "vendor.xiaomi.hardware.mlipay@1.0::IMlipayService";
|
||||
|
||||
private static final int ACTIVITY_START_SUCCESS = 0;
|
||||
private static final int ACTIVITY_START_FAILED = -1;
|
||||
// private static final String mFingerActName = "com.android.settings.NewFingerprintActivity";
|
||||
// private static final String mFingerPackName = "com.android.settings";
|
||||
private static final String mIfaaActName = "org.ifaa.android.manager.IFAAService";
|
||||
private static final String mIfaaInterfaceDesc = "org.ifaa.android.manager.IIFAAService";
|
||||
private static final String mIfaaPackName = "com.tencent.soter.soterserver";
|
||||
|
||||
private static IBinder mService = null;
|
||||
private static final String seperate = ",";
|
||||
private String mDevModel = null;
|
||||
|
||||
private static Context mContext = null;
|
||||
|
||||
private static ServiceConnection ifaaconn = new ServiceConnection() {
|
||||
public void onServiceConnected(ComponentName name, IBinder service) {
|
||||
mService = service;
|
||||
try {
|
||||
mService.linkToDeath(mDeathRecipient, 0);
|
||||
} catch (RemoteException e) {
|
||||
Slog.e(TAG, "linkToDeath fail.", e);
|
||||
}
|
||||
}
|
||||
|
||||
public void onServiceDisconnected(ComponentName name) {
|
||||
if (mContext != null) {
|
||||
Slog.i(IFAAManagerImpl.TAG, "re-bind the service.");
|
||||
initService();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
private static DeathRecipient mDeathRecipient = new DeathRecipient() {
|
||||
public void binderDied() {
|
||||
if (mService != null) {
|
||||
Slog.d(TAG, "binderDied, unlink the service.");
|
||||
mService.unlinkToDeath(mDeathRecipient, 0);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
public static IFAAManagerV4 getInstance(Context context) {
|
||||
if (INSTANCE == null) {
|
||||
synchronized (IFAAManagerImpl.class) {
|
||||
if (INSTANCE == null) {
|
||||
INSTANCE = new IFAAManagerImpl();
|
||||
if (VERSION.SDK_INT >= 28) {
|
||||
mContext = context;
|
||||
initService();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return INSTANCE;
|
||||
}
|
||||
|
||||
private static void initService() {
|
||||
Intent ifaaIntent = new Intent();
|
||||
ifaaIntent.setClassName(mIfaaPackName, mIfaaActName);
|
||||
if (!mContext.bindService(ifaaIntent, ifaaconn, 1)) {
|
||||
Slog.e(TAG, "cannot bind service org.ifaa.android.manager.IFAAService");
|
||||
}
|
||||
}
|
||||
|
||||
public int getSupportBIOTypes(Context context) {
|
||||
int ifaaProp;
|
||||
int res;
|
||||
String fpVendor;
|
||||
int ifaa_2dfa_support = 0; // FeatureParser.getInteger("ifaa_2dfa_support", 0);
|
||||
|
||||
if (VERSION.SDK_INT >= 28) {
|
||||
ifaaProp = SystemProperties.getInt("persist.vendor.sys.pay.ifaa", 0);
|
||||
fpVendor = SystemProperties.get(
|
||||
"persist.vendor.sys.fp.vendor", "");
|
||||
} else {
|
||||
ifaaProp = SystemProperties.getInt("persist.sys.ifaa", 0);
|
||||
fpVendor = SystemProperties.get("persist.sys.fp.vendor", "");
|
||||
}
|
||||
|
||||
if ("none".equalsIgnoreCase(fpVendor)) {
|
||||
res = ifaaProp & IFAA_TYPE_IRIS;
|
||||
} else {
|
||||
res = ifaaProp & (IFAA_TYPE_FINGER | IFAA_TYPE_IRIS);
|
||||
}
|
||||
|
||||
if ((res & IFAA_TYPE_FINGER) == IFAA_TYPE_FINGER && sIsFod) {
|
||||
res |= IFAA_TYPE_SENSOR_FOD;
|
||||
}
|
||||
|
||||
if (ifaa_2dfa_support == 1 && IFAAManagerV3.VLAUE_FINGERPRINT_ENABLE.equals(
|
||||
SystemProperties.get("ro.boot.hypvm", ""))) {
|
||||
res |= IFAA_TYPE_2DFA;
|
||||
}
|
||||
|
||||
Slog.i(TAG, "getSupportBIOTypesV26:" + ifaaProp + " " + sIsFod + " " + fpVendor +
|
||||
" res:" + res);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
public int startBIOManager(Context context, int authType) {
|
||||
int res = ACTIVITY_START_FAILED;
|
||||
if (IFAA_TYPE_FINGER == authType) {
|
||||
// Intent intent = new Intent();
|
||||
// intent.setClassName("com.android.settings", mFingerActName);
|
||||
Intent intent = new Intent("android.settings.SECURITY_SETTINGS");
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
context.startActivity(intent);
|
||||
res = ACTIVITY_START_SUCCESS;
|
||||
}
|
||||
if (DEBUG) Slog.i(TAG, "startBIOManager authType:" + authType + " res:" + res);
|
||||
return res;
|
||||
}
|
||||
|
||||
public String getDeviceModel() {
|
||||
// String miuiFeature;
|
||||
if (mDevModel == null) {
|
||||
// miuiFeature = FeatureParser.getString("finger_alipay_ifaa_model");
|
||||
// if (miuiFeature != null) {
|
||||
// if (!StringUtils.EMPTY.equalsIgnoreCase(miuiFeature)) {
|
||||
// this.mDevModel = miuiFeature;
|
||||
// }
|
||||
// }
|
||||
mDevModel = Build.MANUFACTURER + "-" + Build.DEVICE;
|
||||
}
|
||||
if (DEBUG) Slog.i(TAG, "getDeviceModel devcieModel:" + mDevModel);
|
||||
return mDevModel;
|
||||
}
|
||||
|
||||
public int getVersion() {
|
||||
if (DEBUG) Slog.i(TAG, "getVersion sdk:" + VERSION.SDK_INT + " ifaaVer:" + sIfaaVer);
|
||||
return sIfaaVer;
|
||||
}
|
||||
|
||||
public byte[] processCmdV2(Context context, byte[] param) {
|
||||
Slog.i(TAG, "processCmdV2 sdk:" + VERSION.SDK_INT);
|
||||
|
||||
if (VERSION.SDK_INT >= 28) {
|
||||
int retry_count = 10;
|
||||
|
||||
while (true) {
|
||||
int retry_count2 = retry_count - 1;
|
||||
if (retry_count <= 0) {
|
||||
break;
|
||||
}
|
||||
if (mService == null || !mService.pingBinder()) {
|
||||
Slog.i(TAG, "processCmdV2 waiting ifaaService, remain: " +
|
||||
retry_count2 + " time(s)");
|
||||
try {
|
||||
Thread.sleep(30);
|
||||
} catch (InterruptedException e) {
|
||||
Slog.e(TAG, "processCmdV2 InterruptedException while waiting: " + e);
|
||||
}
|
||||
} else {
|
||||
Parcel data = Parcel.obtain();
|
||||
Parcel reply = Parcel.obtain();
|
||||
try {
|
||||
data.writeInterfaceToken(mIfaaInterfaceDesc);
|
||||
data.writeByteArray(param);
|
||||
mService.transact(CODE_PROCESS_CMD, data, reply, 0);
|
||||
reply.readException();
|
||||
return reply.createByteArray();
|
||||
} catch (RemoteException e) {
|
||||
Slog.e(TAG, "processCmdV2 transact failed. " + e);
|
||||
retry_count = retry_count2;
|
||||
} finally {
|
||||
data.recycle();
|
||||
reply.recycle();
|
||||
}
|
||||
}
|
||||
retry_count = retry_count2;
|
||||
}
|
||||
}
|
||||
HwParcel hidl_reply = new HwParcel();
|
||||
try {
|
||||
IHwBinder hwService = HwBinder.getService(SERVICE_NAME, "default");
|
||||
if (hwService != null) {
|
||||
HwParcel hidl_request = new HwParcel();
|
||||
hidl_request.writeInterfaceToken(INTERFACE_DESCRIPTOR);
|
||||
ArrayList<Byte> sbuf = new ArrayList(Arrays.asList(HwBlob.wrapArray(param)));
|
||||
hidl_request.writeInt8Vector(sbuf);
|
||||
hidl_request.writeInt32(sbuf.size());
|
||||
hwService.transact(CODE_PROCESS_CMD, hidl_request, hidl_reply, 0);
|
||||
hidl_reply.verifySuccess();
|
||||
hidl_request.releaseTemporaryStorage();
|
||||
ArrayList<Byte> val = hidl_reply.readInt8Vector();
|
||||
int n = val.size();
|
||||
byte[] array = new byte[n];
|
||||
for (int i = 0; i < n; i++) {
|
||||
array[i] = ((Byte) val.get(i)).byteValue();
|
||||
}
|
||||
hidl_reply.release();
|
||||
return array;
|
||||
}
|
||||
} catch (RemoteException e) {
|
||||
Slog.e(TAG, "transact failed. " + e);
|
||||
} finally {
|
||||
hidl_reply.release();
|
||||
}
|
||||
Slog.e(TAG, "processCmdV2, return null");
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getExtInfo(int authType, String keyExtInfo) {
|
||||
return initExtString();
|
||||
}
|
||||
|
||||
public void setExtInfo(int authType, String keyExtInfo, String valExtInfo) {
|
||||
}
|
||||
|
||||
public int getEnabled(int bioType) {
|
||||
if (IFAA_TYPE_FINGER == bioType) {
|
||||
return 1000;
|
||||
}
|
||||
return 1003;
|
||||
}
|
||||
|
||||
public int[] getIDList(int bioType) {
|
||||
int[] idList = new int[]{0};
|
||||
if (IFAA_TYPE_FINGER == bioType) {
|
||||
int retry_count = 10;
|
||||
while (true) {
|
||||
int retry_count2 = retry_count - 1;
|
||||
if (retry_count <= 0) {
|
||||
break;
|
||||
}
|
||||
if (mService == null || !mService.pingBinder()) {
|
||||
try {
|
||||
Thread.sleep(30);
|
||||
} catch (InterruptedException e) {
|
||||
Slog.e(TAG, "getIDList InterruptedException while waiting: " + e);
|
||||
}
|
||||
} else {
|
||||
Parcel data = Parcel.obtain();
|
||||
Parcel reply = Parcel.obtain();
|
||||
try {
|
||||
data.writeInterfaceToken(mIfaaInterfaceDesc);
|
||||
data.writeInt(bioType);
|
||||
mService.transact(CODE_GETIDLIST_CMD, data, reply, 0);
|
||||
reply.readException();
|
||||
idList = reply.createIntArray();
|
||||
} catch (RemoteException e) {
|
||||
Slog.e(TAG, "getIDList transact failed. " + e);
|
||||
} finally {
|
||||
data.recycle();
|
||||
reply.recycle();
|
||||
}
|
||||
}
|
||||
retry_count = retry_count2;
|
||||
}
|
||||
}
|
||||
return idList;
|
||||
}
|
||||
|
||||
private String initExtString() {
|
||||
String extStr = "";
|
||||
JSONObject obj = new JSONObject();
|
||||
JSONObject keyInfo = new JSONObject();
|
||||
String xy = "";
|
||||
String wh = "";
|
||||
|
||||
if (VERSION.SDK_INT >= 28) {
|
||||
xy = SystemProperties.get("persist.vendor.sys.fp.fod.location.X_Y", "");
|
||||
wh = SystemProperties.get("persist.vendor.sys.fp.fod.size.width_height", "");
|
||||
} else {
|
||||
xy = SystemProperties.get("persist.sys.fp.fod.location.X_Y", "");
|
||||
wh = SystemProperties.get("persist.sys.fp.fod.size.width_height", "");
|
||||
}
|
||||
|
||||
try {
|
||||
if (validateVal(xy) && validateVal(wh)) {
|
||||
String[] splitXy = xy.split(seperate);
|
||||
String[] splitWh = wh.split(seperate);
|
||||
keyInfo.put("startX", Integer.parseInt(splitXy[0]));
|
||||
keyInfo.put("startY", Integer.parseInt(splitXy[1]));
|
||||
keyInfo.put("width", Integer.parseInt(splitWh[0]));
|
||||
keyInfo.put("height", Integer.parseInt(splitWh[1]));
|
||||
keyInfo.put("navConflict", true);
|
||||
obj.put("type", 0);
|
||||
obj.put("fullView", keyInfo);
|
||||
extStr = obj.toString();
|
||||
} else {
|
||||
Slog.e(TAG, "initExtString invalidate, xy:" + xy + " wh:" + wh);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Slog.e(TAG, "Exception , xy:" + xy + " wh:" + wh, e);
|
||||
}
|
||||
return extStr;
|
||||
}
|
||||
|
||||
private boolean validateVal(String value) {
|
||||
if ("".equalsIgnoreCase(value) || !value.contains(seperate)) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
package org.ifaa.android.manager;
|
||||
|
||||
import android.compat.annotation.UnsupportedAppUsage;
|
||||
import android.content.Context;
|
||||
|
||||
public abstract class IFAAManagerV2 extends IFAAManager {
|
||||
@UnsupportedAppUsage
|
||||
public abstract byte[] processCmdV2(Context paramContext, byte[] paramArrayOfByte);
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
package org.ifaa.android.manager;
|
||||
|
||||
import android.compat.annotation.UnsupportedAppUsage;
|
||||
|
||||
public abstract class IFAAManagerV3 extends IFAAManagerV2 {
|
||||
@UnsupportedAppUsage
|
||||
public static final String KEY_FINGERPRINT_FULLVIEW = "org.ifaa.ext.key.CUSTOM_VIEW";
|
||||
@UnsupportedAppUsage
|
||||
public static final String KEY_GET_SENSOR_LOCATION = "org.ifaa.ext.key.GET_SENSOR_LOCATION";
|
||||
@UnsupportedAppUsage
|
||||
public static final String VALUE_FINGERPRINT_DISABLE = "disable";
|
||||
@UnsupportedAppUsage
|
||||
public static final String VLAUE_FINGERPRINT_ENABLE = "enable";
|
||||
|
||||
@UnsupportedAppUsage
|
||||
public abstract String getExtInfo(int authType, String keyExtInfo);
|
||||
|
||||
@UnsupportedAppUsage
|
||||
public abstract void setExtInfo(int authType, String keyExtInfo, String valExtInfo);
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
package org.ifaa.android.manager;
|
||||
|
||||
import android.compat.annotation.UnsupportedAppUsage;
|
||||
|
||||
public abstract class IFAAManagerV4 extends IFAAManagerV3 {
|
||||
@UnsupportedAppUsage
|
||||
public abstract int getEnabled(int bioType);
|
||||
|
||||
@UnsupportedAppUsage
|
||||
public abstract int[] getIDList(int bioType);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
package org.ifaa.android.manager;
|
||||
|
||||
interface IIFAAService {
|
||||
byte[] processCmd_v2(in byte[] param);
|
||||
int[] getIDList(int bioType);
|
||||
int faceEnroll(String sessionId, int flags);
|
||||
int faceUpgrade(int action, String path, int offset, in byte[] data, int data_len);
|
||||
int faceAuthenticate_v2(String sessionId, int flags);
|
||||
int faceCancel_v2(String sessionId);
|
||||
byte[] faceInvokeCommand(in byte[] param);
|
||||
int faceGetCellinfo();
|
||||
}
|
||||
|
|
@ -299,6 +299,7 @@ PRODUCT_COPY_FILES += \
|
|||
|
||||
# IFAAService
|
||||
PRODUCT_PACKAGES += \
|
||||
IFAAService \
|
||||
org.ifaa.android.manager
|
||||
|
||||
# IFAA JAR
|
||||
|
|
|
|||
Loading…
Reference in a new issue