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:
@@ -0,0 +1,67 @@
|
||||
/*
|
||||
* Copyright (C) 2023 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.privatespace.onelock;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.lifecycle.Lifecycle;
|
||||
|
||||
import com.android.settings.biometrics.combination.BiometricFingerprintStatusPreferenceController;
|
||||
import com.android.settings.privatespace.PrivateSpaceMaintainer;
|
||||
|
||||
public class PrivateSpaceFingerprintPreferenceController
|
||||
extends BiometricFingerprintStatusPreferenceController {
|
||||
private static final String TAG = "PrivateSpaceFingerCtrl";
|
||||
|
||||
public PrivateSpaceFingerprintPreferenceController(Context context, String key) {
|
||||
super(context, key);
|
||||
}
|
||||
|
||||
public PrivateSpaceFingerprintPreferenceController(
|
||||
Context context, String key, Lifecycle lifecycle) {
|
||||
super(context, key, lifecycle);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isUserSupported() {
|
||||
return android.os.Flags.allowPrivateProfile()
|
||||
&& android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
|
||||
&& getUserId() != UserHandle.USER_NULL;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getUserId() {
|
||||
UserHandle privateProfileHandle =
|
||||
PrivateSpaceMaintainer.getInstance(mContext).getPrivateProfileHandle();
|
||||
if (privateProfileHandle != null) {
|
||||
return privateProfileHandle.getIdentifier();
|
||||
} else {
|
||||
Log.e(TAG, "Private profile user handle is not expected to be null.");
|
||||
}
|
||||
return UserHandle.USER_NULL;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return android.os.Flags.allowPrivateProfile()
|
||||
&& android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
|
||||
? AVAILABLE
|
||||
: UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user