Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "calling back SetupFaceLock to clean up temporary gallery"

Browse Source
This commit is contained in:
Steven Ross
2011-09-30 11:08:47 -07:00
committed by Android (Google) Code Review
parent eba3d92341 329979c9e6
commit d42825f40e
1 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -23,6 +23,7 @@ import com.google.android.collect.Lists;
import android.app.admin.DevicePolicyManager;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.os.FileObserver;
import android.os.IBinder;
import android.os.RemoteException;
@@ -125,6 +126,8 @@ public class LockPatternUtils {
private static FileObserver sPasswordObserver;
private static boolean mLastAttemptWasBiometric = false;
private static class PasswordFileObserver extends FileObserver {
public PasswordFileObserver(String path, int mask) {
super(path, mask);
@@ -371,7 +374,8 @@ public class LockPatternUtils {
/**
* Clear any lock pattern or password.
*/
public void clearLock() {
public void clearLock(boolean isFallback) {
if(!isFallback) deleteGallery();
saveLockPassword(null, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
setLockPatternEnabled(false);
saveLockPattern(null);
@@ -389,6 +393,13 @@ public class LockPatternUtils {
setLong(DISABLE_LOCKSCREEN_KEY, disable ? 1 : 0);
}
/**
* Sets whether the last lockscreen setup attempt was biometric
*/
public static void setLastAttemptWasBiometric(boolean val) {
mLastAttemptWasBiometric = val;
}
/**
* Determine if LockScreen can be disabled. This is used, for example, to tell if we should
* show LockScreen or go straight to the home screen.
@@ -407,6 +418,41 @@ public class LockPatternUtils {
this.saveLockPattern(pattern, false);
}
/**
* Calls back SetupFaceLock to save the temporary gallery file if this is the backup lock.
* This doesn't have to verify that biometric is enabled because it's only called in that case
*/
void moveTempGallery() {
Intent intent = new Intent().setClassName("com.android.facelock",
"com.android.facelock.SetupFaceLock");
intent.putExtra("moveTempGallery", true);
mContext.startActivity(intent);
}
/**
* Calls back SetupFaceLock to delete the temporary gallery file if this is the backup lock.
*/
public void deleteTempGallery() {
//if(mLastAttemptWasBiometric) {
Intent intent = new Intent().setClassName("com.android.facelock",
"com.android.facelock.SetupFaceLock");
intent.putExtra("deleteTempGallery", true);
mContext.startActivity(intent);
//}
}
/**
* Calls back SetupFaceLock to delete the gallery file when the lock type is changed
*/
void deleteGallery() {
if(isBiometricEnabled()) {
Intent intent = new Intent().setClassName("com.android.facelock",
"com.android.facelock.SetupFaceLock");
intent.putExtra("deleteGallery", true);
mContext.startActivity(intent);
}
}
/**
* Save a lock pattern.
* @param pattern The new pattern to save.
@@ -431,11 +477,13 @@ public class LockPatternUtils {
keyStore.password(patternToString(pattern));
setBoolean(PATTERN_EVER_CHOSEN_KEY, true);
if (!isFallback) {
deleteGallery();
setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
} else {
setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK);
setLong(PASSWORD_TYPE_ALTERNATE_KEY,
DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
moveTempGallery();
}
dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, pattern
.size(), 0, 0, 0, 0, 0, 0);
@@ -547,10 +595,12 @@ public class LockPatternUtils {
int computedQuality = computePasswordQuality(password);
if (!isFallback) {
deleteGallery();
setLong(PASSWORD_TYPE_KEY, Math.max(quality, computedQuality));
} else {
setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK);
setLong(PASSWORD_TYPE_ALTERNATE_KEY, Math.max(quality, computedQuality));
moveTempGallery();
}
if (computedQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
int letters = 0;