From e36a2d863e1e7595e87e75e536c9bf409af5d040 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Wed, 19 Jun 2024 15:36:16 +0800 Subject: [PATCH] Clean up unused fields from MobileNetworkRepository Bug: 348118234 Flag: EXEMPT refactor Test: manual on Mobile Settings Change-Id: I45520aac3bd3f2e31c396056f4f38b52e4e6fa55 --- .../network/MobileNetworkRepository.java | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java index 8ee5389bfca..ce6f8842f9c 100644 --- a/src/com/android/settings/network/MobileNetworkRepository.java +++ b/src/com/android/settings/network/MobileNetworkRepository.java @@ -49,7 +49,6 @@ import com.android.settingslib.mobile.dataservice.MobileNetworkInfoDao; import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity; import com.android.settingslib.mobile.dataservice.SubscriptionInfoDao; import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; -import com.android.settingslib.mobile.dataservice.UiccInfoDao; import com.android.settingslib.mobile.dataservice.UiccInfoEntity; import java.util.ArrayList; @@ -81,12 +80,9 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions private SubscriptionManager mSubscriptionManager; private MobileNetworkDatabase mMobileNetworkDatabase; private SubscriptionInfoDao mSubscriptionInfoDao; - private UiccInfoDao mUiccInfoDao; private MobileNetworkInfoDao mMobileNetworkInfoDao; private List mAvailableSubInfoEntityList = new ArrayList<>(); private List mActiveSubInfoEntityList = new ArrayList<>(); - private List mUiccInfoEntityList = new ArrayList<>(); - private List mMobileNetworkInfoEntityList = new ArrayList<>(); private Context mContext; private AirplaneModeObserver mAirplaneModeObserver; private DataRoamingObserver mDataRoamingObserver; @@ -124,7 +120,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_MOBILE_NETWORK_DB_CREATED); mSubscriptionManager = context.getSystemService(SubscriptionManager.class); mSubscriptionInfoDao = mMobileNetworkDatabase.mSubscriptionInfoDao(); - mUiccInfoDao = mMobileNetworkDatabase.mUiccInfoDao(); mMobileNetworkInfoDao = mMobileNetworkDatabase.mMobileNetworkInfoDao(); mAirplaneModeObserver = new AirplaneModeObserver(new Handler(Looper.getMainLooper())); mDataRoamingObserver = new DataRoamingObserver(new Handler(Looper.getMainLooper())); @@ -338,22 +333,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions lifecycleOwner, this::onAllMobileNetworkInfoChanged); } - public List getAvailableSubInfoEntityList() { - return mAvailableSubInfoEntityList; - } - - public List getActiveSubscriptionInfoList() { - return mActiveSubInfoEntityList; - } - - public List getUiccInfoEntityList() { - return mUiccInfoEntityList; - } - - public List getMobileNetworkInfoEntityList() { - return mMobileNetworkInfoEntityList; - } - public SubscriptionInfoEntity getSubInfoById(String subId) { return mSubscriptionInfoDao.querySubInfoById(subId); } @@ -464,7 +443,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions } private void onAllUiccInfoChanged(List uiccInfoEntityList) { - mUiccInfoEntityList = new ArrayList<>(uiccInfoEntityList); for (MobileNetworkCallback callback : sCallbacks) { callback.onAllUiccInfoChanged(uiccInfoEntityList); } @@ -474,7 +452,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions private void onAllMobileNetworkInfoChanged( List mobileNetworkInfoEntityList) { - mMobileNetworkInfoEntityList = new ArrayList<>(mobileNetworkInfoEntityList); for (MobileNetworkCallback callback : sCallbacks) { callback.onAllMobileNetworkInfoChanged(mobileNetworkInfoEntityList); } @@ -515,8 +492,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions mMobileNetworkDatabase.deleteSubInfoBySubId(subId); mMobileNetworkDatabase.deleteUiccInfoBySubId(subId); mMobileNetworkDatabase.deleteMobileNetworkInfoBySubId(subId); - mUiccInfoEntityList.removeIf(info -> info.subId.equals(subId)); - mMobileNetworkInfoEntityList.removeIf(info -> info.subId.equals(subId)); int id = Integer.parseInt(subId); removerRegisterBySubId(id); mSubscriptionInfoMap.remove(id); @@ -741,7 +716,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions } private class PhoneCallStateTelephonyCallback extends TelephonyCallback implements - TelephonyCallback.CallStateListener, TelephonyCallback.UserMobileDataStateListener { private int mSubId; @@ -750,13 +724,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions mSubId = subId; } - @Override - public void onCallStateChanged(int state) { - for (MobileNetworkCallback callback : sCallbacks) { - callback.onCallStateChanged(state); - } - } - @Override public void onUserMobileDataStateChanged(boolean enabled) { Log.d(TAG, "onUserMobileDataStateChanged enabled " + enabled + " on SUB " + mSubId); @@ -793,9 +760,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions */ default void onDataRoamingChanged(int subId, boolean enabled) { } - - default void onCallStateChanged(int state) { - } } public void dump(IndentingPrintWriter printwriter) { @@ -803,8 +767,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions printwriter.increaseIndent(); printwriter.println(" availableSubInfoEntityList= " + mAvailableSubInfoEntityList); printwriter.println(" activeSubInfoEntityList=" + mActiveSubInfoEntityList); - printwriter.println(" mobileNetworkInfoEntityList= " + mMobileNetworkInfoEntityList); - printwriter.println(" uiccInfoEntityList= " + mUiccInfoEntityList); printwriter.println(" CacheSubscriptionInfoEntityMap= " + sCacheSubscriptionInfoEntityMap); printwriter.println(" SubscriptionInfoMap= " + mSubscriptionInfoMap); printwriter.flush();