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

No show DisableSimFooterPreference when sub not found

Browse Source 
DisableSimFooterPreferenceController.getAvailabilityStatus() used to
return AVAILABLE when the subscription is not found in selectable
subscription info list.

Return CONDITIONALLY_UNAVAILABLE in this case to fix.

Bug: 336232487
Test: manual - on Mobile Settings
Change-Id: I88642fc9853ce6603a78dfdc0e5fed1da1553adc
This commit is contained in:
Chaohui Wang
2024-05-06 17:53:18 +08:00
parent 211afbea96
commit e216fd4248
5 changed files with 159 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/com/android/settings/network/telephony/DisableSimFooterPreferenceController.java
View File

@@ -1,62 +0,0 @@
/*
* Copyright (C) 2019 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.content.Context;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import com.android.settings.network.SubscriptionUtil;
/**
* Shows information about disable a physical SIM.
*/
public class DisableSimFooterPreferenceController extends TelephonyBasePreferenceController {
/**
* Constructor
*/
public DisableSimFooterPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
/**
* re-init for SIM based on given subscription ID.
* @param subId is the given subscription ID
*/
public void init(int subId) {
mSubId = subId;
}
@Override
public int getAvailabilityStatus(int subId) {
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
return CONDITIONALLY_UNAVAILABLE;
}
SubscriptionManager subManager = mContext.getSystemService(SubscriptionManager.class);
for (SubscriptionInfo info : SubscriptionUtil.getAvailableSubscriptions(mContext)) {
if (info.getSubscriptionId() == subId) {
if (info.isEmbedded() || SubscriptionUtil.showToggleForPhysicalSim(subManager)) {
return CONDITIONALLY_UNAVAILABLE;
}
break;
}
}
return AVAILABLE;
}
}

54
src/com/android/settings/network/telephony/DisableSimFooterPreferenceController.kt Normal file
View File

@@ -0,0 +1,54 @@
/*
* 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.content.Context
import android.telephony.SubscriptionManager
/**
* Shows information about disable a physical SIM.
*/
class DisableSimFooterPreferenceController @JvmOverloads constructor(
context: Context,
preferenceKey: String,
private val subscriptionRepository: SubscriptionRepository = SubscriptionRepository(context),
) : TelephonyBasePreferenceController(context, preferenceKey) {
/**
* Re-init for SIM based on given subscription ID.
*
* @param subId is the given subscription ID
*/
fun init(subId: Int) {
mSubId = subId
}
override fun getAvailabilityStatus(subId: Int): Int {
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID ||
subscriptionRepository.canDisablePhysicalSubscription()
) {
return CONDITIONALLY_UNAVAILABLE
}
val isAvailable =
subscriptionRepository.getSelectableSubscriptionInfoList().any { subInfo ->
subInfo.subscriptionId == subId && !subInfo.isEmbedded
}
return if (isAvailable) AVAILABLE else CONDITIONALLY_UNAVAILABLE
}
}

3
src/com/android/settings/network/telephony/SubscriptionRepository.kt
View File

@@ -36,6 +36,8 @@ import kotlinx.coroutines.flow.onEach
private const val TAG = "SubscriptionRepository"
class SubscriptionRepository(private val context: Context) {
private val subscriptionManager = context.requireSubscriptionManager()
/**
* Return a list of subscriptions that are available and visible to the user.
*
@@ -55,6 +57,7 @@ class SubscriptionRepository(private val context: Context) {
isSubscriptionEnabledFlow(subId).collectLatestWithLifecycle(lifecycleOwner, action = action)
}
fun canDisablePhysicalSubscription() = subscriptionManager.canDisablePhysicalSubscription()
}
val Context.subscriptionManager: SubscriptionManager?