Merge "Passing useLiveliness flag to FUL in startUi call"

Author: Brian Colonna

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);

policy/src/com/android/internal/policy/impl/FaceUnlock.java

@@ -291,7 +291,8 @@ public void start(IBinder windowToken, int x, int y, int w, int h) {
                 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;