PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide data for BiometricsSafetySource

Browse Source 
Test: atest SettingsUnitTests

Bug: 215517420
Bug: 221449065
Change-Id: Id635a02443295757aab277971c4d95a9a62f5576
This commit is contained in:
Yuri Ufimtsev
2022-02-23 14:01:37 +00:00
parent 3afc9399f7
commit 2b5bf34eda
5 changed files with 663 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/com/android/settings/biometrics/BiometricNavigationUtils.java
View File

@@ -19,14 +19,17 @@ package com.android.settings.biometrics;
import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
import static com.android.settings.biometrics.BiometricEnrollBase.EXTRA_FROM_SETTINGS_SUMMARY;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import com.android.settings.Utils;
import com.android.internal.app.UnlaunchableAppActivity;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.transition.SettingsTransitionHelper;
/**
@@ -41,15 +44,62 @@ public class BiometricNavigationUtils {
* for managed profile, otherwise shows a dialog to disable the Quiet Mode.
*
* @param className The class name of Settings screen to launch.
* @param extras Extras to put into the launching {@link Intent}.
* @param extras Extras to put into the launching {@link Intent}.
* @return true if the Settings screen is launching.
*/
public boolean launchBiometricSettings(Context context, String className, Bundle extras) {
final UserManager userManager = UserManager.get(context);
if (Utils.startQuietModeDialogIfNecessary(context, userManager, mUserId)) {
final Intent quietModeDialogIntent = getQuietModeDialogIntent(context);
if (quietModeDialogIntent != null) {
context.startActivity(quietModeDialogIntent);
return false;
}
context.startActivity(getSettingsPageIntent(className, extras));
return true;
}
/**
* Returns {@link Intent} to launch an appropriate Settings screen.
*
* <p>If the Setting is disabled by admin, returns {@link Intent} to launch an explanation.
* If Quiet Mode is enabled for managed profile, returns {@link Intent} to launch a dialog
* to disable the Quiet Mode. Otherwise, returns {@link Intent} to launch the Settings screen.
*
* @param className The class name of Settings screen to launch.
* @param enforcedAdmin Details of admin account that disables changing the setting.
* @param extras Extras to put into the result {@link Intent}.
*/
public Intent getBiometricSettingsIntent(Context context, String className,
EnforcedAdmin enforcedAdmin, Bundle extras) {
if (enforcedAdmin != null) {
return getRestrictedDialogIntent(context, enforcedAdmin);
}
final Intent quietModeDialogIntent = getQuietModeDialogIntent(context);
return quietModeDialogIntent != null ? quietModeDialogIntent
: getSettingsPageIntent(className, extras);
}
private Intent getQuietModeDialogIntent(Context context) {
final UserManager userManager = UserManager.get(context);
if (userManager.isQuietModeEnabled(UserHandle.of(mUserId))) {
return UnlaunchableAppActivity.createInQuietModeDialogIntent(mUserId);
}
return null;
}
private Intent getRestrictedDialogIntent(Context context, EnforcedAdmin enforcedAdmin) {
final Intent intent = RestrictedLockUtils
.getShowAdminSupportDetailsIntent(context, enforcedAdmin);
int targetUserId = mUserId;
if (enforcedAdmin.user != null && RestrictedLockUtils
.isCurrentUserOrProfile(context, enforcedAdmin.user.getIdentifier())) {
targetUserId = enforcedAdmin.user.getIdentifier();
}
intent.putExtra(DevicePolicyManager.EXTRA_RESTRICTION, enforcedAdmin.enforcedRestriction);
intent.putExtra(Intent.EXTRA_USER_ID, targetUserId);
return intent;
}
private Intent getSettingsPageIntent(String className, Bundle extras) {
final Intent intent = new Intent();
intent.setClassName(SETTINGS_PACKAGE_NAME, className);
if (!extras.isEmpty()) {
@@ -59,7 +109,7 @@ public class BiometricNavigationUtils {
intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE,
SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE);
context.startActivity(intent);
return true;
return intent;
}
}

90
src/com/android/settings/safetycenter/BiometricsSafetySource.java
View File

@@ -16,14 +16,30 @@
package com.android.settings.safetycenter;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import android.safetycenter.SafetySourceData;
import android.safetycenter.SafetySourceStatus;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricNavigationUtils;
import com.android.settings.biometrics.combination.CombinedBiometricStatusUtils;
import com.android.settings.biometrics.face.FaceStatusUtils;
import com.android.settings.biometrics.fingerprint.FingerprintStatusUtils;
import com.android.settingslib.RestrictedLockUtils;
/** Combined Biometrics Safety Source for Safety Center. */
public final class BiometricsSafetySource {
public static final String SAFETY_SOURCE_ID = "Biometrics";
private BiometricsSafetySource() {}
private BiometricsSafetySource() {
}
/** Sends biometric safety data to Safety Center. */
public static void sendSafetyData(Context context) {
@@ -31,7 +47,75 @@ public final class BiometricsSafetySource {
return;
}
// TODO(b/215517420): Send biometric data to Safety Center if there are biometrics available
// on this device.
final BiometricNavigationUtils biometricNavigationUtils = new BiometricNavigationUtils();
final CombinedBiometricStatusUtils combinedBiometricStatusUtils =
new CombinedBiometricStatusUtils(context);
if (combinedBiometricStatusUtils.isAvailable()) {
final RestrictedLockUtils.EnforcedAdmin disablingAdmin =
combinedBiometricStatusUtils.getDisablingAdmin();
sendBiometricSafetySourceData(context,
context.getString(R.string.security_settings_biometric_preference_title),
combinedBiometricStatusUtils.getSummary(),
biometricNavigationUtils.getBiometricSettingsIntent(context,
combinedBiometricStatusUtils.getSettingsClassName(), disablingAdmin,
Bundle.EMPTY),
disablingAdmin == null /* enabled */);
return;
}
final FaceManager faceManager = Utils.getFaceManagerOrNull(context);
final FaceStatusUtils faceStatusUtils = new FaceStatusUtils(context, faceManager);
if (faceStatusUtils.isAvailable()) {
final RestrictedLockUtils.EnforcedAdmin disablingAdmin =
faceStatusUtils.getDisablingAdmin();
sendBiometricSafetySourceData(context,
context.getString(R.string.security_settings_face_preference_title),
faceStatusUtils.getSummary(),
biometricNavigationUtils.getBiometricSettingsIntent(context,
faceStatusUtils.getSettingsClassName(), disablingAdmin,
Bundle.EMPTY),
disablingAdmin == null /* enabled */);
return;
}
final FingerprintManager fingerprintManager = Utils.getFingerprintManagerOrNull(context);
final FingerprintStatusUtils fingerprintStatusUtils = new FingerprintStatusUtils(context,
fingerprintManager);
if (fingerprintStatusUtils.isAvailable()) {
final RestrictedLockUtils.EnforcedAdmin disablingAdmin =
fingerprintStatusUtils.getDisablingAdmin();
sendBiometricSafetySourceData(context,
context.getString(R.string.security_settings_fingerprint_preference_title),
fingerprintStatusUtils.getSummary(),
biometricNavigationUtils.getBiometricSettingsIntent(context,
fingerprintStatusUtils.getSettingsClassName(), disablingAdmin,
Bundle.EMPTY),
disablingAdmin == null /* enabled */);
}
}
private static void sendBiometricSafetySourceData(Context context, String title, String summary,
Intent clickIntent, boolean enabled) {
final PendingIntent pendingIntent = createPendingIntent(context, clickIntent);
final SafetySourceStatus status = new SafetySourceStatus.Builder(title, summary,
SafetySourceStatus.STATUS_LEVEL_NONE, pendingIntent)
.setEnabled(enabled).build();
final SafetySourceData safetySourceData = new SafetySourceData.Builder(SAFETY_SOURCE_ID)
.setStatus(status).build();
SafetyCenterManagerWrapper.get().sendSafetyCenterUpdate(context, safetySourceData);
}
private static PendingIntent createPendingIntent(Context context, Intent intent) {
return PendingIntent
.getActivity(
context,
0 /* requestCode */,
intent,
PendingIntent.FLAG_IMMUTABLE);
}
}