Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-dev (5ccb07df) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/face/FaceUpdater.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -104,7 +104,7 @@ public class FaceUpdater {
	public void onEnrollmentProgress(int remaining) {		public void onEnrollmentProgress(int remaining) {
	mCallback.onEnrollmentProgress(remaining);		mCallback.onEnrollmentProgress(remaining);
	if (remaining == 0) {		if (remaining == 0) {
	BiometricsSafetySource.sendSafetyData(mContext); // biometrics data changed		BiometricsSafetySource.onBiometricsChanged(mContext); // biometrics data changed
	}		}
	}		}
	}		}
	@@ -131,7 +131,7 @@ public class FaceUpdater {
	@Override		@Override
	public void onRemovalSucceeded(@Nullable Face fp, int remaining) {		public void onRemovalSucceeded(@Nullable Face fp, int remaining) {
	mCallback.onRemovalSucceeded(fp, remaining);		mCallback.onRemovalSucceeded(fp, remaining);
	BiometricsSafetySource.sendSafetyData(mContext); // biometrics data changed		BiometricsSafetySource.onBiometricsChanged(mContext); // biometrics data changed
	}		}
	}		}
	}		}

src/com/android/settings/biometrics/fingerprint/FingerprintUpdater.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -88,7 +88,7 @@ public class FingerprintUpdater {
	public void onEnrollmentProgress(int remaining) {		public void onEnrollmentProgress(int remaining) {
	mCallback.onEnrollmentProgress(remaining);		mCallback.onEnrollmentProgress(remaining);
	if (remaining == 0) {		if (remaining == 0) {
	BiometricsSafetySource.sendSafetyData(mContext); // biometrics data changed		BiometricsSafetySource.onBiometricsChanged(mContext); // biometrics data changed
	}		}
	}		}
	}		}
	@@ -115,7 +115,7 @@ public class FingerprintUpdater {
	@Override		@Override
	public void onRemovalSucceeded(@Nullable Fingerprint fp, int remaining) {		public void onRemovalSucceeded(@Nullable Fingerprint fp, int remaining) {
	mCallback.onRemovalSucceeded(fp, remaining);		mCallback.onRemovalSucceeded(fp, remaining);
	BiometricsSafetySource.sendSafetyData(mContext); // biometrics data changed		BiometricsSafetySource.onBiometricsChanged(mContext); // biometrics data changed
	}		}
	}		}
	}		}

src/com/android/settings/safetycenter/BiometricsSafetySource.java

+28 −15

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ import android.content.Intent;
	import android.hardware.face.FaceManager;		import android.hardware.face.FaceManager;
	import android.hardware.fingerprint.FingerprintManager;		import android.hardware.fingerprint.FingerprintManager;
	import android.os.Bundle;		import android.os.Bundle;
			import android.safetycenter.SafetyEvent;
	import android.safetycenter.SafetySourceData;		import android.safetycenter.SafetySourceData;
	import android.safetycenter.SafetySourceStatus;		import android.safetycenter.SafetySourceStatus;

	@@ -38,11 +39,10 @@ public final class BiometricsSafetySource {

	public static final String SAFETY_SOURCE_ID = "Biometrics";		public static final String SAFETY_SOURCE_ID = "Biometrics";

	private BiometricsSafetySource() {		private BiometricsSafetySource() {}
	}

	/** Sends biometric safety data to Safety Center. */		/** Sets biometric safety data for Safety Center. */
	public static void sendSafetyData(Context context) {		public static void setSafetySourceData(Context context, SafetyEvent safetyEvent) {
	if (!SafetyCenterManagerWrapper.get().isEnabled(context)) {		if (!SafetyCenterManagerWrapper.get().isEnabled(context)) {
	return;		return;
	}		}
	@@ -54,13 +54,14 @@ public final class BiometricsSafetySource {
	if (combinedBiometricStatusUtils.isAvailable()) {		if (combinedBiometricStatusUtils.isAvailable()) {
	final RestrictedLockUtils.EnforcedAdmin disablingAdmin =		final RestrictedLockUtils.EnforcedAdmin disablingAdmin =
	combinedBiometricStatusUtils.getDisablingAdmin();		combinedBiometricStatusUtils.getDisablingAdmin();
	sendBiometricSafetySourceData(context,		setBiometricSafetySourceData(context,
	context.getString(R.string.security_settings_biometric_preference_title),		context.getString(R.string.security_settings_biometric_preference_title),
	combinedBiometricStatusUtils.getSummary(),		combinedBiometricStatusUtils.getSummary(),
	biometricNavigationUtils.getBiometricSettingsIntent(context,		biometricNavigationUtils.getBiometricSettingsIntent(context,
	combinedBiometricStatusUtils.getSettingsClassName(), disablingAdmin,		combinedBiometricStatusUtils.getSettingsClassName(), disablingAdmin,
	Bundle.EMPTY),		Bundle.EMPTY),
	disablingAdmin == null /* enabled */);		disablingAdmin == null /* enabled */,
			safetyEvent);
	return;		return;
	}		}

	@@ -70,13 +71,15 @@ public final class BiometricsSafetySource {
	if (faceStatusUtils.isAvailable()) {		if (faceStatusUtils.isAvailable()) {
	final RestrictedLockUtils.EnforcedAdmin disablingAdmin =		final RestrictedLockUtils.EnforcedAdmin disablingAdmin =
	faceStatusUtils.getDisablingAdmin();		faceStatusUtils.getDisablingAdmin();
	sendBiometricSafetySourceData(context,		setBiometricSafetySourceData(context,
	context.getString(R.string.security_settings_face_preference_title),		context.getString(R.string.security_settings_face_preference_title),
	faceStatusUtils.getSummary(),		faceStatusUtils.getSummary(),
	biometricNavigationUtils.getBiometricSettingsIntent(context,		biometricNavigationUtils.getBiometricSettingsIntent(context,
	faceStatusUtils.getSettingsClassName(), disablingAdmin,		faceStatusUtils.getSettingsClassName(), disablingAdmin,
	Bundle.EMPTY),		Bundle.EMPTY),
	disablingAdmin == null /* enabled */);		disablingAdmin == null /* enabled */,
			safetyEvent);

	return;		return;
	}		}

	@@ -87,27 +90,37 @@ public final class BiometricsSafetySource {
	if (fingerprintStatusUtils.isAvailable()) {		if (fingerprintStatusUtils.isAvailable()) {
	final RestrictedLockUtils.EnforcedAdmin disablingAdmin =		final RestrictedLockUtils.EnforcedAdmin disablingAdmin =
	fingerprintStatusUtils.getDisablingAdmin();		fingerprintStatusUtils.getDisablingAdmin();
	sendBiometricSafetySourceData(context,		setBiometricSafetySourceData(context,
	context.getString(R.string.security_settings_fingerprint_preference_title),		context.getString(R.string.security_settings_fingerprint_preference_title),
	fingerprintStatusUtils.getSummary(),		fingerprintStatusUtils.getSummary(),
	biometricNavigationUtils.getBiometricSettingsIntent(context,		biometricNavigationUtils.getBiometricSettingsIntent(context,
	fingerprintStatusUtils.getSettingsClassName(), disablingAdmin,		fingerprintStatusUtils.getSettingsClassName(), disablingAdmin,
	Bundle.EMPTY),		Bundle.EMPTY),
	disablingAdmin == null /* enabled */);		disablingAdmin == null /* enabled */,
			safetyEvent);
			}
	}		}

			/** Notifies Safety Center of a change in biometrics settings. */
			public static void onBiometricsChanged(Context context) {
			setSafetySourceData(
			context,
			new SafetyEvent.Builder(SafetyEvent.SAFETY_EVENT_TYPE_SOURCE_STATE_CHANGED).build()
			);
	}		}

	private static void sendBiometricSafetySourceData(Context context, String title, String summary,		private static void setBiometricSafetySourceData(Context context, String title, String summary,
	Intent clickIntent, boolean enabled) {		Intent clickIntent, boolean enabled, SafetyEvent safetyEvent) {
	final PendingIntent pendingIntent = createPendingIntent(context, clickIntent);		final PendingIntent pendingIntent = createPendingIntent(context, clickIntent);

	final SafetySourceStatus status = new SafetySourceStatus.Builder(title, summary,		final SafetySourceStatus status = new SafetySourceStatus.Builder(title, summary,
	SafetySourceStatus.STATUS_LEVEL_NONE, pendingIntent)		SafetySourceStatus.STATUS_LEVEL_NONE, pendingIntent)
	.setEnabled(enabled).build();		.setEnabled(enabled).build();
	final SafetySourceData safetySourceData = new SafetySourceData.Builder(SAFETY_SOURCE_ID)		final SafetySourceData safetySourceData =
	.setStatus(status).build();		new SafetySourceData.Builder().setStatus(status).build();

	SafetyCenterManagerWrapper.get().sendSafetyCenterUpdate(context, safetySourceData);		SafetyCenterManagerWrapper.get().setSafetySourceData(
			context, SAFETY_SOURCE_ID, safetySourceData, safetyEvent);
	}		}

	private static PendingIntent createPendingIntent(Context context, Intent intent) {		private static PendingIntent createPendingIntent(Context context, Intent intent) {

src/com/android/settings/safetycenter/LockScreenSafetySource.java

+18 −8

Original line number	Original line	Diff line number	Diff line
	@@ -16,11 +16,14 @@

	package com.android.settings.safetycenter;		package com.android.settings.safetycenter;

			import static android.safetycenter.SafetyEvent.SAFETY_EVENT_TYPE_SOURCE_STATE_CHANGED;

	import android.app.PendingIntent;		import android.app.PendingIntent;
	import android.app.settings.SettingsEnums;		import android.app.settings.SettingsEnums;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	import android.os.UserHandle;		import android.os.UserHandle;
			import android.safetycenter.SafetyEvent;
	import android.safetycenter.SafetySourceData;		import android.safetycenter.SafetySourceData;
	import android.safetycenter.SafetySourceIssue;		import android.safetycenter.SafetySourceIssue;
	import android.safetycenter.SafetySourceStatus;		import android.safetycenter.SafetySourceStatus;
	@@ -42,9 +45,10 @@ public final class LockScreenSafetySource {
	private LockScreenSafetySource() {		private LockScreenSafetySource() {
	}		}

	/** Sends lock screen safety data to Safety Center. */		/** Sets lock screen safety data for Safety Center. */
	public static void sendSafetyData(Context context,		public static void setSafetySourceData(Context context,
	ScreenLockPreferenceDetailsUtils screenLockPreferenceDetailsUtils) {		ScreenLockPreferenceDetailsUtils screenLockPreferenceDetailsUtils,
			SafetyEvent safetyEvent) {
	if (!SafetyCenterManagerWrapper.get().isEnabled(context)) {		if (!SafetyCenterManagerWrapper.get().isEnabled(context)) {
	return;		return;
	}		}
	@@ -71,21 +75,27 @@ public final class LockScreenSafetySource {
	.setEnabled(		.setEnabled(
	!screenLockPreferenceDetailsUtils.isPasswordQualityManaged(userId, admin))		!screenLockPreferenceDetailsUtils.isPasswordQualityManaged(userId, admin))
	.setIconAction(gearMenuIconAction).build();		.setIconAction(gearMenuIconAction).build();
	final SafetySourceData.Builder safetySourceDataBuilder = new SafetySourceData.Builder(		final SafetySourceData.Builder safetySourceDataBuilder =
	SAFETY_SOURCE_ID).setStatus(status);		new SafetySourceData.Builder().setStatus(status);
	if (!screenLockPreferenceDetailsUtils.isLockPatternSecure()) {		if (!screenLockPreferenceDetailsUtils.isLockPatternSecure()) {
	safetySourceDataBuilder.addIssue(createNoScreenLockIssue(context, pendingIntent));		safetySourceDataBuilder.addIssue(createNoScreenLockIssue(context, pendingIntent));
	}		}
	final SafetySourceData safetySourceData = safetySourceDataBuilder.build();		final SafetySourceData safetySourceData = safetySourceDataBuilder.build();

	SafetyCenterManagerWrapper.get().sendSafetyCenterUpdate(context, safetySourceData);		SafetyCenterManagerWrapper.get().setSafetySourceData(
			context,
			SAFETY_SOURCE_ID,
			safetySourceData,
			safetyEvent
			);
	}		}

	/** Notifies Safety Center of a change in lock screen settings. */		/** Notifies Safety Center of a change in lock screen settings. */
	public static void onLockScreenChange(Context context) {		public static void onLockScreenChange(Context context) {
	sendSafetyData(		setSafetySourceData(
	context,		context,
	new ScreenLockPreferenceDetailsUtils(context, SettingsEnums.SAFETY_CENTER));		new ScreenLockPreferenceDetailsUtils(context, SettingsEnums.SAFETY_CENTER),
			new SafetyEvent.Builder(SAFETY_EVENT_TYPE_SOURCE_STATE_CHANGED).build());
	}		}

	private static IconAction createGearMenuIconAction(Context context,		private static IconAction createGearMenuIconAction(Context context,

src/com/android/settings/safetycenter/SafetyCenterManagerWrapper.java

+16 −4

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package com.android.settings.safetycenter;

	import android.content.Context;		import android.content.Context;
	import android.safetycenter.SafetyCenterManager;		import android.safetycenter.SafetyCenterManager;
			import android.safetycenter.SafetyEvent;
	import android.safetycenter.SafetySourceData;		import android.safetycenter.SafetySourceData;
	import android.util.Log;		import android.util.Log;

	@@ -26,7 +27,12 @@ import com.android.internal.annotations.VisibleForTesting;
	/** A wrapper for the SafetyCenterManager system service. */		/** A wrapper for the SafetyCenterManager system service. */
	public class SafetyCenterManagerWrapper {		public class SafetyCenterManagerWrapper {

	private static final String TAG = "SafetyCenterManagerWrapper";		/**
			* Tag for logging.
			*
			* <p>The tag is restricted to 23 characters (the maximum allowed for Android logging).
			*/
			private static final String TAG = "SafetyCenterManagerWrap";

	@VisibleForTesting		@VisibleForTesting
	public static SafetyCenterManagerWrapper sInstance;		public static SafetyCenterManagerWrapper sInstance;
	@@ -41,8 +47,10 @@ public class SafetyCenterManagerWrapper {
	return sInstance;		return sInstance;
	}		}

	/** Sends updated safety source data to Safety Center. */		/** Sets the latest safety source data for Safety Center. */
	public void sendSafetyCenterUpdate(Context context, SafetySourceData safetySourceData) {		public void setSafetySourceData(Context context, String safetySourceId,
			SafetySourceData safetySourceData,
			SafetyEvent safetyEvent) {
	SafetyCenterManager safetyCenterManager =		SafetyCenterManager safetyCenterManager =
	context.getSystemService(SafetyCenterManager.class);		context.getSystemService(SafetyCenterManager.class);

	@@ -52,7 +60,11 @@ public class SafetyCenterManagerWrapper {
	}		}

	try {		try {
	safetyCenterManager.sendSafetyCenterUpdate(safetySourceData);		safetyCenterManager.setSafetySourceData(
			safetySourceId,
			safetySourceData,
			safetyEvent
			);
	} catch (Exception e) {		} catch (Exception e) {
	Log.e(TAG, "Failed to send SafetySourceData", e);		Log.e(TAG, "Failed to send SafetySourceData", e);
	return;		return;