Add Biometrics settings inside private space One Lock settings
This includes below changes: - Add Biometrics preferernce in Private Space One Lock settings page - Face and Fingerprint enrolment for Private profile - Feature is behind flag android.multiuser.enable_biometrics_to_unlock_private_space Screenshots: go/ss/9cWZRAuvGGW7gMm.png go/ss/B3NoFbL3KbpSzeN.png go/ss/7xH3DLi9d6Lu2mR.png go/ss/8WBEgKychWpduXg.png go/ss/8pmPGshd9aiPvVC.png go/ss/AFPBPbiaBBvTj3p.png go/ss/3fE4XKLLUdP8LmF.png Bug: 308862923 Test: atest CombinedBiometricStatusUtilsTest, atest FaceFingerprintUnlockControllerTest Change-Id: I1853107a4df4fc97db53c97524c6d44a4f554e37
This commit is contained in:
@@ -31,6 +31,7 @@ import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
@@ -122,15 +123,15 @@ public class UseOneLockControllerSwitch extends AbstractPreferenceController
|
||||
}
|
||||
|
||||
/** Method to handle onActivityResult */
|
||||
public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
public boolean handleActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
||||
if (requestCode == UNUNIFY_PRIVATE_LOCK_FROM_DEVICE_REQUEST
|
||||
&& resultCode == Activity.RESULT_OK) {
|
||||
&& resultCode == Activity.RESULT_OK && data != null) {
|
||||
mCurrentDevicePassword =
|
||||
data.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
|
||||
separateLocks();
|
||||
return true;
|
||||
} else if (requestCode == UNIFY_PRIVATE_LOCK_WITH_DEVICE_REQUEST
|
||||
&& resultCode == Activity.RESULT_OK) {
|
||||
&& resultCode == Activity.RESULT_OK && data != null) {
|
||||
mCurrentProfilePassword =
|
||||
data.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
|
||||
unifyLocks();
|
||||
|
Reference in New Issue
Block a user