summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brian Colonna <bcolonna@google.com> 2012-04-09 14:55:23 -0400
committer Brian Colonna <bcolonna@google.com> 2012-04-09 16:36:28 -0400
commitf66e930e726f4caf49b7d47c08d160b14628c99f (patch)
treee56fda006a71b2bbc7cb3dedec982d1ed97bba6f
parent425c726ae0691cadc1b03b5f3726368fbdc46bff (diff)
Passing useLiveliness flag to FUL in startUi call
Because of changes in support of multi-user functionaity, the FUL 'eye blink' checkbox was no longer enabling liveliness detection. It no longer makes sense to check the biometric flags (such as the liveliness flag) inside of the Face Unlock service. Instead, that flag is now passed in from lockscreen via the aidl interface when startUi is called. Change-Id: I591cf1924fbb24da7d54b94ef29824e5197d3b20
-rw-r--r--core/java/com/android/internal/policy/IFaceLockInterface.aidl3
-rw-r--r--policy/src/com/android/internal/policy/impl/FaceUnlock.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/com/android/internal/policy/IFaceLockInterface.aidl b/core/java/com/android/internal/policy/IFaceLockInterface.aidl
index 3958cda6db1c..017801bbf886 100644
--- a/core/java/com/android/internal/policy/IFaceLockInterface.aidl
+++ b/core/java/com/android/internal/policy/IFaceLockInterface.aidl
@@ -20,7 +20,8 @@ import com.android.internal.policy.IFaceLockCallback;
/** {@hide} */
interface IFaceLockInterface {
- void startUi(IBinder containingWindowToken, int x, int y, int width, int height);
+ void startUi(IBinder containingWindowToken, int x, int y, int width, int height,
+ boolean useLiveliness);
void stopUi();
void registerCallback(IFaceLockCallback cb);
void unregisterCallback(IFaceLockCallback cb);
diff --git a/policy/src/com/android/internal/policy/impl/FaceUnlock.java b/policy/src/com/android/internal/policy/impl/FaceUnlock.java
index 2ae99e622acd..985dcd31c7a9 100644
--- a/policy/src/com/android/internal/policy/impl/FaceUnlock.java
+++ b/policy/src/com/android/internal/policy/impl/FaceUnlock.java
@@ -291,7 +291,8 @@ public class FaceUnlock implements Handler.Callback {
if (!mServiceRunning) {
if (DEBUG) Log.d(TAG, "Starting FaceLock");
try {
- mService.startUi(windowToken, x, y, w, h);
+ mService.startUi(windowToken, x, y, w, h,
+ mLockPatternUtils.isBiometricWeakLivelinessEnabled());
} catch (RemoteException e) {
Log.e(TAG, "Caught exception starting FaceLock: " + e.toString());
return;