import android.os.IRemoteCallback;
import android.os.Message;
import android.os.RemoteException;
-import android.os.SystemClock;
import android.os.Trace;
import android.os.UserHandle;
import android.os.UserManager;
import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
import android.telephony.TelephonyManager;
-import android.util.ArraySet;
import android.util.Log;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.widget.LockPatternUtils;
+import com.android.systemui.recents.misc.SystemServicesProxy;
+import com.android.systemui.recents.misc.SystemServicesProxy.TaskStackListener;
import java.io.FileDescriptor;
import java.io.PrintWriter;
private static final int MSG_SCREEN_TURNED_OFF = 332;
private static final int MSG_DREAMING_STATE_CHANGED = 333;
private static final int MSG_USER_UNLOCKED = 334;
+ private static final int MSG_ASSISTANT_STACK_CHANGED = 335;
/** Fingerprint state: Not listening to fingerprint. */
private static final int FINGERPRINT_STATE_STOPPED = 0;
private boolean mBootCompleted;
private boolean mNeedsSlowUnlockTransition;
private boolean mHasLockscreenWallpaper;
+ private boolean mAssistantVisible;
+ private boolean mKeyguardOccluded;
// Device provisioning state
private boolean mDeviceProvisioned;
case MSG_USER_UNLOCKED:
handleUserUnlocked();
break;
+ case MSG_ASSISTANT_STACK_CHANGED:
+ mAssistantVisible = (boolean)msg.obj;
+ updateFingerprintListeningState();
+ break;
}
}
};
mKeyguardGoingAway = goingAway;
}
+ /**
+ * Updates KeyguardUpdateMonitor's internal state to know if keyguard is occluded
+ * @param occluded
+ */
+ public void setKeyguardOccluded(boolean occluded) {
+ mKeyguardOccluded = occluded;
+ updateFingerprintListeningState();
+ }
+
private void onFingerprintAuthenticated(int userId) {
Trace.beginSection("KeyGuardUpdateMonitor#onFingerPrintAuthenticated");
mUserFingerprintAuthenticated.put(userId, true);
cb.onFingerprintAuthenticated(userId);
}
}
+
+ // Only authenticate fingerprint once when assistant is visible
+ mAssistantVisible = false;
+ updateFingerprintListeningState();
+
Trace.endSection();
}
mFpm.addLockoutResetCallback(mLockoutResetCallback);
}
+ SystemServicesProxy.getInstance(mContext).registerTaskStackListener(mTaskStackListener);
mUserManager = context.getSystemService(UserManager.class);
}
private boolean shouldListenForFingerprint() {
return (mKeyguardIsVisible || !mDeviceInteractive ||
- (mBouncer && !mKeyguardGoingAway) || mGoingToSleep)
+ (mBouncer && !mKeyguardGoingAway) || mGoingToSleep ||
+ (mAssistantVisible && mKeyguardOccluded))
&& !mSwitchingUser && !isFingerprintDisabled(getCurrentUser());
}
private void stopListeningForFingerprint() {
if (DEBUG) Log.v(TAG, "stopListeningForFingerprint()");
if (mFingerprintRunningState == FINGERPRINT_STATE_RUNNING) {
- mFingerprintCancelSignal.cancel();
- mFingerprintCancelSignal = null;
+ if (mFingerprintCancelSignal != null) {
+ mFingerprintCancelSignal.cancel();
+ mFingerprintCancelSignal = null;
+ }
setFingerprintRunningState(FINGERPRINT_STATE_CANCELLING);
}
if (mFingerprintRunningState == FINGERPRINT_STATE_CANCELLING_RESTARTING) {
}
}
+ private final TaskStackListener mTaskStackListener = new TaskStackListener() {
+ @Override
+ public void onTaskStackChangedBackground() {
+ try {
+ ActivityManager.StackInfo info = ActivityManager.getService().getStackInfo(
+ ActivityManager.StackId.ASSISTANT_STACK_ID);
+ if (info == null) {
+ return;
+ }
+ mHandler.sendMessage(mHandler.obtainMessage(MSG_ASSISTANT_STACK_CHANGED,
+ info.visible));
+ } catch (RemoteException e) {
+ Log.e(TAG, "unable to check task stack", e);
+ }
+ }
+ };
+
/**
* @return true if and only if the state has changed for the specified {@code slotId}
*/