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

Catch IllegalStateException when get carrier config

Browse Source 
Fix: 319149441
Test: manual - on System Update page
Test: unit test
Change-Id: I484a036b2ce086531b20e1a5ca7e541934bc4c07
This commit is contained in:
Chaohui Wang
2024-01-15 16:52:06 +08:00
parent 4130a95c5d
commit 9a6a0865de
4 changed files with 119 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/com/android/settings/network/telephony/CarrierConfigManagerExt.kt Normal file
View File

@@ -0,0 +1,39 @@
/*
* Copyright (C) 2024 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.network.telephony
import android.os.PersistableBundle
import android.telephony.CarrierConfigManager
import android.telephony.SubscriptionManager
import androidx.core.os.persistableBundleOf
/**
* Gets the configuration values of the specified config keys applied.
*/
fun CarrierConfigManager.safeGetConfig(
keys: List<String>,
subId: Int = SubscriptionManager.getDefaultSubscriptionId(),
): PersistableBundle = try {
getConfigForSubId(subId, *keys.toTypedArray())
} catch (e: IllegalStateException) {
// The CarrierConfigLoader (the service implemented the CarrierConfigManager) hasn't been
// initialized yet. This may occurs during very early phase of phone booting up or when Phone
// process has been restarted.
// Settings should not assume Carrier config loader (and any other system services as well) are
// always available. If not available, use default value instead.
persistableBundleOf()
}

13
src/com/android/settings/system/ClientInitiatedActionRepository.kt
View File

@@ -20,6 +20,7 @@ import android.content.Context
import android.content.Intent
import android.telephony.CarrierConfigManager
import android.util.Log
import com.android.settings.network.telephony.safeGetConfig
class ClientInitiatedActionRepository(private val context: Context) {
private val configManager = context.getSystemService(CarrierConfigManager::class.java)!!
@@ -29,11 +30,13 @@ class ClientInitiatedActionRepository(private val context: Context) {
*/
fun onSystemUpdate() {
val bundle =
configManager.getConfig(
CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL,
CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING,
CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING,
CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING,
configManager.safeGetConfig(
keys = listOf(
CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL,
CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING,
CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING,
CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING,
),
)
if (!bundle.getBoolean(CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL)) return