Merge "Replace inappropriate SupervisionManager property accessor usage with... (948cfe03) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/supervision/SupervisionDeletePinPreference.kt

+14 −8

Original line number	Diff line number	Diff line
		@@ -75,15 +75,18 @@ class SupervisionDeletePinPreference() :

		if (supervisionManager == null \|\| userManager == null) {
		// TODO(b/415995161): Improve error handling
		builder.setTitle(R.string.supervision_delete_pin_error_header)
		builder
		.setTitle(R.string.supervision_delete_pin_error_header)
		.setMessage(R.string.supervision_delete_pin_error_message)
		.setPositiveButton(R.string.okay, null)
		} else if (areAnyUsersExceptCurrentSupervised(supervisionManager, userManager)) {
		builder.setTitle(R.string.supervision_delete_pin_supervision_enabled_header)
		builder
		.setTitle(R.string.supervision_delete_pin_supervision_enabled_header)
		.setMessage(R.string.supervision_delete_pin_supervision_enabled_message)
		.setPositiveButton(R.string.okay, null)
		} else {
		builder.setTitle(R.string.supervision_delete_pin_confirm_header)
		builder
		.setTitle(R.string.supervision_delete_pin_confirm_header)
		.setMessage(R.string.supervision_delete_pin_confirm_message)
		.setPositiveButton(R.string.delete) { _, _ -> onConfirmDeleteClick() }
		.setNegativeButton(R.string.cancel, null)
		@@ -99,16 +102,19 @@ class SupervisionDeletePinPreference() :
		.setTitle(R.string.supervision_delete_pin_error_header)
		.setMessage(R.string.supervision_delete_pin_error_message)
		.setPositiveButton(R.string.okay, null)
		.create().show()
		.create()
		.show()
		}

		/** Returns whether any users except the current user are supervised on this device. */
		@VisibleForTesting
		fun areAnyUsersExceptCurrentSupervised(
		supervisionManager: SupervisionManager,
		userManager: UserManager): Boolean {
		userManager: UserManager,
		): Boolean {
		return userManager.users.any {
		lifeCycleContext.userId != it.id && supervisionManager.isSupervisionEnabledForUser(it.id)
		lifeCycleContext.userId != it.id &&
		supervisionManager.isSupervisionEnabledForUser(it.id)
		}
		}

		@@ -126,8 +132,8 @@ class SupervisionDeletePinPreference() :
		return
		}
		if (userManager.removeUser(supervisingUser)) {
		supervisionManager.isSupervisionEnabled = false
		supervisionManager.supervisionRecoveryInfo = null
		supervisionManager.setSupervisionEnabled(false)
		supervisionManager.setSupervisionRecoveryInfo(null)
		lifeCycleContext.notifyPreferenceChange(KEY)
		SubSettingLauncher(lifeCycleContext)
		.setDestination(SupervisionDashboardFragment::class.java.name)

src/com/android/settings/supervision/SupervisionPinManagementScreen.kt

+4 −2

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ class SupervisionPinManagementScreen :
		return null
		}
		val recoveryInfo =
		context.getSystemService(SupervisionManager::class.java)?.supervisionRecoveryInfo
		context.getSystemService(SupervisionManager::class.java)?.getSupervisionRecoveryInfo()
		return when {
		recoveryInfo == null -> {
		context.getString(R.string.supervision_pin_management_preference_summary_add)
		@@ -83,7 +83,9 @@ class SupervisionPinManagementScreen :
		override fun getIcon(context: Context): Int {
		if (Flags.enableSupervisionPinRecoveryScreen()) {
		val recoveryInfo =
		context.getSystemService(SupervisionManager::class.java)?.supervisionRecoveryInfo
		context
		.getSystemService(SupervisionManager::class.java)
		?.getSupervisionRecoveryInfo()
		if (recoveryInfo == null \|\| recoveryInfo.state == STATE_PENDING) {
		// if recovery is not fully setup.
		return R.drawable.exclamation_icon

src/com/android/settings/supervision/SupervisionPinRecoveryActivity.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -189,7 +189,7 @@ class SupervisionPinRecoveryActivity : FragmentActivity() {
		},
		)
		}
		supervisionManager?.supervisionRecoveryInfo = recoveryInfo
		supervisionManager?.setSupervisionRecoveryInfo(recoveryInfo)
		handleSuccess()
		} else {
		handleError("Cannot save recovery info, no recovery info from result.")
		@@ -261,7 +261,7 @@ class SupervisionPinRecoveryActivity : FragmentActivity() {
		private fun resetSupervisionUser(): Boolean {
		val userManager = getSystemService(UserManager::class.java)
		val supervisionManager = getSystemService(SupervisionManager::class.java)
		val isSupervisionEnabled = supervisionManager.isSupervisionEnabled
		val isSupervisionEnabled = supervisionManager.isSupervisionEnabled()
		if (isSupervisionEnabled) {
		// Disables supervision temporally to allow user reset.
		supervisionManager.setSupervisionEnabled(false)

src/com/android/settings/supervision/SupervisionPinRecoveryPreference.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,9 @@ class SupervisionPinRecoveryPreference : PreferenceMetadata, PreferenceAvailabil
		if (!Flags.enableSupervisionPinRecoveryScreen()) {
		return false
		}
		return context.getSystemService(SupervisionManager::class.java)?.supervisionRecoveryInfo !=
		null
		return context
		.getSystemService(SupervisionManager::class.java)
		?.getSupervisionRecoveryInfo() != null
		}

		override fun intent(context: Context): Intent? =

src/com/android/settings/supervision/SupervisionSetupRecoveryPreference.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ class SupervisionSetupRecoveryPreference :
		private fun accountNameToVerify(context: Context): String? {
		return context
		.getSystemService(SupervisionManager::class.java)
		?.supervisionRecoveryInfo
		?.getSupervisionRecoveryInfo()
		?.accountName
		}