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

Merge "Ignore face settings extras when called by an external package." into security-aosp-25Q2-staging

Browse Source
This commit is contained in:
Treehugger Robot
2025-06-27 12:35:09 -07:00
committed by Android (Google) Code Review
parent ea8022feeb 0baf462586
commit c8cd292a99
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -95,8 +95,8 @@ public class FaceSettings extends DashboardFragment {
private FaceManager mFaceManager;
private DevicePolicyManager mDevicePolicyManager;
private int mUserId;
private int mSensorId;
private long mChallenge;
private int mSensorId = -1;
private long mChallenge = 0;
private byte[] mToken;
private FaceSettingsAttentionPreferenceController mAttentionController;
private FaceSettingsRemoveButtonPreferenceController mRemoveController;
@@ -181,12 +181,19 @@ public class FaceSettings extends DashboardFragment {
mUserManager = context.getSystemService(UserManager.class);
mFaceManager = context.getSystemService(FaceManager.class);
mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class);
mToken = getIntent().getByteArrayExtra(KEY_TOKEN);
mSensorId = getIntent().getIntExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, -1);
mChallenge = getIntent().getLongExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, 0L);
mUserId = getActivity().getIntent().getIntExtra(
Intent.EXTRA_USER_ID, UserHandle.myUserId());
final SettingsActivity activity = (SettingsActivity) requireActivity();
final String callingPackage = activity.getInitialCallingPackage();
if (callingPackage == null || !callingPackage.equals(activity.getPackageName())) {
mUserId = UserHandle.myUserId();
} else {
// only allow these extras when called internally by Settings
mToken = getIntent().getByteArrayExtra(KEY_TOKEN);
mSensorId = getIntent().getIntExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, -1);
mChallenge = getIntent().getLongExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, 0L);
mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
}
mFaceFeatureProvider = FeatureFactory.getFeatureFactory().getFaceFeatureProvider();
if (mUserManager.getUserInfo(mUserId).isManagedProfile()) {