New SystemUpdateRepository
Extract getSystemUpdateIntent, and add unit test. Bug: 311110616 Test: manual - on "Software updates" page Test: unit test Change-Id: Ic7c06490d1d324705f547b2394794605e85485a4
This commit is contained in:
@@ -28,7 +28,6 @@ import androidx.lifecycle.repeatOnLifecycle
|
||||
import androidx.preference.Preference
|
||||
import androidx.preference.PreferenceScreen
|
||||
import com.android.settings.R
|
||||
import com.android.settings.Utils
|
||||
import com.android.settings.core.BasePreferenceController
|
||||
import com.android.settingslib.spaprivileged.framework.common.userManager
|
||||
import kotlinx.coroutines.launch
|
||||
@@ -36,6 +35,7 @@ import kotlinx.coroutines.launch
|
||||
open class SystemUpdatePreferenceController(context: Context, preferenceKey: String) :
|
||||
BasePreferenceController(context, preferenceKey) {
|
||||
private val userManager: UserManager = context.userManager
|
||||
private val systemUpdateRepository = SystemUpdateRepository(context)
|
||||
private val clientInitiatedActionRepository = ClientInitiatedActionRepository(context)
|
||||
private lateinit var preference: Preference
|
||||
|
||||
@@ -48,12 +48,12 @@ open class SystemUpdatePreferenceController(context: Context, preferenceKey: Str
|
||||
super.displayPreference(screen)
|
||||
preference = screen.findPreference(preferenceKey)!!
|
||||
if (isAvailable) {
|
||||
Utils.updatePreferenceToSpecificActivityOrRemove(
|
||||
mContext,
|
||||
screen,
|
||||
preferenceKey,
|
||||
Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY,
|
||||
)
|
||||
val intent = systemUpdateRepository.getSystemUpdateIntent()
|
||||
if (intent != null) { // Replace the intent with this specific activity
|
||||
preference.intent = intent
|
||||
} else { // Did not find a matching activity, so remove the preference
|
||||
screen.removePreference(preference)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
38
src/com/android/settings/system/SystemUpdateRepository.kt
Normal file
38
src/com/android/settings/system/SystemUpdateRepository.kt
Normal file
@@ -0,0 +1,38 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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.system
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import android.provider.Settings
|
||||
|
||||
class SystemUpdateRepository(context: Context) {
|
||||
private val packageManager = context.packageManager
|
||||
|
||||
/**
|
||||
* Finds a matching activity for the system update intent.
|
||||
*/
|
||||
fun getSystemUpdateIntent(): Intent? {
|
||||
val intent = Intent(Settings.ACTION_SYSTEM_UPDATE_SETTINGS)
|
||||
return packageManager.resolveActivity(intent, PackageManager.MATCH_SYSTEM_ONLY)
|
||||
?.activityInfo
|
||||
?.let { activityInfo ->
|
||||
Intent().setClassName(activityInfo.packageName, activityInfo.name)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user