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

[Settings] Apply the SettingsDataService to the SIM page, calls/smscontroller

Browse Source 
Calls/SmsDefaultSubscriptionController

Bug: 257197354
Test: atest DefaultSubscriptionControllerTest
Change-Id: I67cb2d3aa5ef3c6751d90b96db27a062071c8113
This commit is contained in:
Zoey Chen
2022-11-21 06:39:12 +00:00
parent 7292c4a017
commit 64330a235a
12 changed files with 294 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/NetworkProviderCallsSmsController.java
View File

@@ -37,6 +37,7 @@ import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.mobile.dataservice.DataServiceUtils;
import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity;
import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
import com.android.settingslib.mobile.dataservice.UiccInfoEntity;
@@ -97,7 +98,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
@Override
public CharSequence getSummary() {
List<SubscriptionInfoEntity> list = getSubscriptionInfoList();
if (list == null || list .isEmpty()) {
if (list == null || list.isEmpty()) {
return setSummaryResId(R.string.calls_sms_no_sim);
} else {
final StringBuilder summary = new StringBuilder();
@@ -223,10 +224,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
@Override
public void onActiveSubInfoChanged(List<SubscriptionInfoEntity> activeSubInfoList) {
if ((mSubInfoEntityList != null &&
(activeSubInfoList.isEmpty() || !activeSubInfoList.equals(mSubInfoEntityList)))
|| (!activeSubInfoList.isEmpty() && mSubInfoEntityList == null)) {
Log.d(TAG, "subInfo list from framework is changed, update the subInfo entity list.");
if (DataServiceUtils.shouldUpdateEntityList(mSubInfoEntityList, activeSubInfoList)) {
mSubInfoEntityList = activeSubInfoList;
update();
}