Allow smart unlock right after boot.
This change enables relaxing the constraint by which
strong authentication is needed after device reboot.
There are very limited use cases where this might be
safe, one of which is in a car. Cars head units usually
are protected physically by the car and have hardware
anti-theft mechanisms so we can potentially allow for
Android to allow users to use smart unlock to avoid the
lockscreen just after boot.
This change adds in a config flag that sets the default
trust flags, which can be set to allow smart unlock after
boot for car head units.
Bug: 26559008
Change-Id: Id6338a97b617ddaf3d2fae5d51235429a42b81cc
diff --git a/services/core/java/com/android/server/LockSettingsStrongAuth.java b/services/core/java/com/android/server/LockSettingsStrongAuth.java
index 0e4d5a7..551ceb8 100644
--- a/services/core/java/com/android/server/LockSettingsStrongAuth.java
+++ b/services/core/java/com/android/server/LockSettingsStrongAuth.java
@@ -20,6 +20,7 @@
import com.android.internal.widget.LockPatternUtils.StrongAuthTracker;
import android.app.trust.IStrongAuthTracker;
+import android.content.Context;
import android.os.DeadObjectException;
import android.os.Handler;
import android.os.Message;
@@ -46,6 +47,11 @@
private final ArrayList<IStrongAuthTracker> mStrongAuthTrackers = new ArrayList<>();
private final SparseIntArray mStrongAuthForUser = new SparseIntArray();
+ private final int mDefaultStrongAuthFlags;
+
+ public LockSettingsStrongAuth(Context context) {
+ mDefaultStrongAuthFlags = StrongAuthTracker.getDefaultFlags(context);
+ }
private void handleAddStrongAuthTracker(IStrongAuthTracker tracker) {
for (int i = 0; i < mStrongAuthTrackers.size(); i++) {
@@ -87,7 +93,7 @@
}
private void handleRequireStrongAuthOneUser(int strongAuthReason, int userId) {
- int oldValue = mStrongAuthForUser.get(userId, LockPatternUtils.StrongAuthTracker.DEFAULT);
+ int oldValue = mStrongAuthForUser.get(userId, mDefaultStrongAuthFlags);
int newValue = strongAuthReason == STRONG_AUTH_NOT_REQUIRED
? STRONG_AUTH_NOT_REQUIRED
: (oldValue | strongAuthReason);
@@ -101,7 +107,7 @@
int index = mStrongAuthForUser.indexOfKey(userId);
if (index >= 0) {
mStrongAuthForUser.removeAt(index);
- notifyStrongAuthTrackers(StrongAuthTracker.DEFAULT, userId);
+ notifyStrongAuthTrackers(mDefaultStrongAuthFlags, userId);
}
}