Merge "[Device Supervision] Minor refactor supervision main switch preference" into main (4ee80ae4) · Commits · e / os / android_packages_apps_Settings

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -72,18 +72,18 @@ class SupervisionMainSwitchPreference(context: Context) :
		}

		override fun onActivityResult(
		context: PreferenceLifecycleContext,
		unused: PreferenceLifecycleContext,
		requestCode: Int,
		resultCode: Int,
		data: Intent?,
		): Boolean {
		if (resultCode == Activity.RESULT_OK) {
		val mainSwitchPreference =
		context.requirePreference<com.android.settingslib.widget.MainSwitchPreference>(KEY)
		lifeCycleContext.requirePreference<com.android.settingslib.widget.MainSwitchPreference>(KEY)
		val newValue = !supervisionMainSwitchStorage.getBoolean(KEY)!!
		mainSwitchPreference.setChecked(newValue)
		updateDependentPreferencesEnabledState(mainSwitchPreference, newValue)
		context.notifyPreferenceChange(SupervisionPinManagementScreen.KEY)
		lifeCycleContext.notifyPreferenceChange(SupervisionPinManagementScreen.KEY)
		}

		return true

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ class SupervisionMainSwitchPreferenceTest {
		object : ContextWrapper(appContext) {
		override fun getSystemService(name: String): Any =
		when (name) {
		Context.SUPERVISION_SERVICE -> mockSupervisionManager
		getSystemServiceName(SupervisionManager::class.java) -> mockSupervisionManager
		else -> super.getSystemService(name)
		}
		}