Declare task affinity for entries that could be launched by SafetyCenter

Test: manual

Bug: 222676668
Change-Id: I44c2f0cee61ffd8f10284cda5a740a9e9d9ea7bb
This commit is contained in:
Yuri Ufimtsev
2022-03-09 09:49:15 +00:00
parent 46756fcb44
commit be98245015
10 changed files with 93 additions and 16 deletions

View File

@@ -0,0 +1,23 @@
/*
* Copyright (C) 2022 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.biometrics.face;
/**
* Wrapper of {@link FaceEnrollIntroduction} to use with a pre-defined task affinity.
*/
public class FaceEnrollIntroductionInternal extends FaceEnrollIntroduction {
}

View File

@@ -71,8 +71,8 @@ public class FaceStatusUtils {
* Returns the class name of the Settings page corresponding to face settings.
*/
public String getSettingsClassName() {
return hasEnrolled() ? Settings.FaceSettingsActivity.class.getName()
: FaceEnrollIntroduction.class.getName();
return hasEnrolled() ? Settings.FaceSettingsInternalActivity.class.getName()
: FaceEnrollIntroductionInternal.class.getName();
}
/**

View File

@@ -0,0 +1,23 @@
/*
* Copyright (C) 2022 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.biometrics.fingerprint;
/**
* Wrapper of {@link FingerprintEnrollIntroduction} to use with a pre-defined task affinity.
*/
public class FingerprintEnrollIntroductionInternal extends FingerprintEnrollIntroduction {
}

View File

@@ -79,7 +79,7 @@ public class FingerprintStatusUtils {
*/
public String getSettingsClassName() {
return hasEnrolled() ? FingerprintSettings.class.getName()
: FingerprintEnrollIntroduction.class.getName();
: FingerprintEnrollIntroductionInternal.class.getName();
}
/**