Skip to content

Oplus/OPPO Udfps Fix #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
n-bilinskyi wants to merge 1 commit into
base: android-16.0.0_r2-td
Choose a base branch
from
Open

Oplus/OPPO Udfps Fix #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.SystemProperties;
import android.util.Log;
import android.util.RotationUtils;
import android.util.SparseBooleanArray;
Expand Down Expand Up @@ -217,6 +218,10 @@ public void onReceive(Context context, Intent intent) {
}
};

private void oplusFpUiReady(boolean fingerDown) {
SystemProperties.set("sys.phh.oplus.fppress", fingerDown ? "1" : "0");
}

private void closeDialog(String reasonString) {
closeDialog(BiometricPrompt.DISMISSED_REASON_USER_CANCEL, reasonString);
}
Expand Down Expand Up @@ -297,10 +302,12 @@ private void handleAllFingerprintAuthenticatorsRegistered(
mUdfpsController.addCallback(new UdfpsController.Callback() {
@Override
public void onFingerUp() {
oplusFpUiReady(false);
}

@Override
public void onFingerDown() {
oplusFpUiReady(true);
if (mCurrentDialog != null) {
mCurrentDialog.onPointerDown();
}
Expand Down
15 changes: 15 additions & 0 deletions services/core/java/com/android/server/biometrics/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,21 @@ static public int[] dynamicUdfpsProps(Context ctxt) {
return udfpsProps;
}

String fpLocationOplus = android.os.SystemProperties.get("persist.vendor.fingerprint.optical.sensorlocation");
if(!TextUtils.isEmpty(fpLocationOplus) && fpLocationOplus.contains("::")) {
int[] udfpsProps = new int[3];
String[] coordinates = fpLocationOplus.split("::");
udfpsProps[0] = Integer.parseInt(coordinates[0]);
udfpsProps[1] = Integer.parseInt(coordinates[1]);

String iconSize = android.os.SystemProperties.get("persist.vendor.fingerprint.optical.iconsize");
udfpsProps[2] = (Integer.parseInt(iconSize) /2);

Slog.d("PHH-Enroll", "Oplus/OPPO UDFPS detected. Props: " + Arrays.toString(udfpsProps));

return udfpsProps;
}

String fpLocation = android.os.SystemProperties.get("persist.vendor.sys.fp.fod.location.X_Y");
if(!TextUtils.isEmpty(fpLocation) && fpLocation.contains(",")) {
int[] udfpsProps = new int[3];
Expand Down
8 changes: 8 additions & 0 deletions ...core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import static android.hardware.fingerprint.FingerprintSensorConfigurations.getIFingerprint;
import static android.hardware.fingerprint.FingerprintSensorConfigurations.remapFqName;

import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;

import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.ActivityManager;
Expand Down Expand Up @@ -297,6 +299,12 @@ private void addAidlSensors(@NonNull SensorProps prop,
android.util.Log.e("PHH-Enroll", " - " + loc.sensorLocationX + ", " + loc.sensorLocationY + ", " +loc.sensorRadius + ", disp =" + loc.display + ", shape " + loc.sensorShape);
}

if (prop.sensorLocations.length == 1 && prop.sensorLocations[0].sensorLocationX > 0) {
android.util.Log.e("PHH-Enroll", "Set fingerprint sensor type UDFPS Optical");
prop.sensorType = TYPE_UDFPS_OPTICAL;
prop.halHandlesDisplayTouches = true;
}

final Sensor sensor = new Sensor(this, mContext, mHandler, prop, mBiometricContext,
workaroundLocations, resetLockoutRequiresHardwareAuthToken);
sensor.init(gestureAvailabilityDispatcher, mLockoutResetDispatcher);
Expand Down