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

Commit 626f6432 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am ddfdfc49: am 60ce06db: am 0a17fb4e: Merge "Move from native... 

am ddfdfc49: am 60ce06db: am 0a17fb4e: Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev

* commit 'ddfdfc49':
  Move from native FingerprintService implementation to fingerprintd
parents f8bfda1a ddfdfc49

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/display/IDisplayManager.aidl \

	core/java/android/hardware/display/IDisplayManagerCallback.aidl \

	core/java/android/hardware/display/IVirtualDisplayCallback.aidl \

	core/java/android/hardware/fingerprint/IFingerprintDaemon.aidl \

	core/java/android/hardware/fingerprint/IFingerprintDaemonCallback.aidl \

	core/java/android/hardware/fingerprint/IFingerprintService.aidl \

	core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl \

	core/java/android/hardware/hdmi/IHdmiControlCallback.aidl \

core/java/android/hardware/fingerprint/FingerprintManager.java

+0 −6
Original line number Diff line number Diff line
@@ -729,12 +729,6 @@ public class FingerprintManager { 
        }

    }



    private void clearCallbacks() {

        mAuthenticationCallback = null;

        mEnrollmentCallback = null;

        mRemovalCallback = null;

    }



    private void cancelEnrollment() {

        if (mService != null) try {

            mService.cancelEnrollment(mToken);

core/java/android/hardware/fingerprint/IFingerprintDaemon.aidl

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source 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.

 */

package android.hardware.fingerprint;



import android.hardware.fingerprint.IFingerprintDaemonCallback;



/**

 * Communication channel from FingerprintService to FingerprintDaemon (fingerprintd)

 * @hide

 */

 

interface IFingerprintDaemon {

    int authenticate(long sessionId, int groupId);

    int cancelAuthentication();

    int enroll(in byte [] token, int groupId, int timeout);

    int cancelEnrollment();

    long preEnroll();

    int remove(int fingerId, int groupId);

    long getAuthenticatorId();

    int setActiveGroup(int groupId, in byte[] path);

    long openHal();

    int closeHal();

    void init(IFingerprintDaemonCallback callback);

}

core/java/android/hardware/fingerprint/IFingerprintDaemonCallback.aidl

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source 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.

 */

package android.hardware.fingerprint;



/**

 * Communication channel from the fingerprintd back to FingerprintService.

 * @hide

 */

 interface IFingerprintDaemonCallback {

    void onEnrollResult(long deviceId, int fingerId, int groupId, int remaining);

    void onAcquired(long deviceId, int acquiredInfo);

    void onAuthenticated(long deviceId, int fingerId, int groupId);

    void onError(long deviceId, int error);

    void onRemoved(long deviceId, int fingerId, int groupId);

    void onEnumerate(long deviceId, in int [] fingerIds, in int [] groupIds);

}

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −3
Original line number Diff line number Diff line
@@ -361,9 +361,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
                Log.d(TAG, "Fingerprint disabled by DPM for userId: " + userId);

                return;

            }

            if (groupId == userId) {

                onFingerprintAuthenticated(groupId);

            }

            onFingerprintAuthenticated(userId);

        } finally {

            setFingerprintRunningDetectionRunning(false);

        }