Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clear TelephonyManagerMap onStop" into udc-dev

Browse Source
This commit is contained in:
Ling Ma
2023-05-12 17:07:54 +00:00
committed by Android (Google) Code Review
parent 419aa7598a aef0bd76db
commit 5a29015e89
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java
View File

@@ -153,14 +153,16 @@ public class InternetDialogController implements AccessPointController.AccessPoi
@VisibleForTesting @VisibleForTesting
/** Should be accessible only to the main thread. */ /** Should be accessible only to the main thread. */
final Map<Integer, TelephonyDisplayInfo> mSubIdTelephonyDisplayInfoMap = new HashMap<>(); final Map<Integer, TelephonyDisplayInfo> mSubIdTelephonyDisplayInfoMap = new HashMap<>();
@VisibleForTesting
/** Should be accessible only to the main thread. */
final Map<Integer, TelephonyManager> mSubIdTelephonyManagerMap = new HashMap<>();
@VisibleForTesting
/** Should be accessible only to the main thread. */
final Map<Integer, TelephonyCallback> mSubIdTelephonyCallbackMap = new HashMap<>();
private WifiManager mWifiManager; private WifiManager mWifiManager;
private Context mContext; private Context mContext;
private SubscriptionManager mSubscriptionManager; private SubscriptionManager mSubscriptionManager;
/** Should be accessible only to the main thread. */
private Map<Integer, TelephonyManager> mSubIdTelephonyManagerMap = new HashMap<>();
/** Should be accessible only to the main thread. */
private Map<Integer, TelephonyCallback> mSubIdTelephonyCallbackMap = new HashMap<>();
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
private ConnectivityManager mConnectivityManager; private ConnectivityManager mConnectivityManager;
private CarrierConfigTracker mCarrierConfigTracker; private CarrierConfigTracker mCarrierConfigTracker;
@@ -320,6 +322,9 @@ public class InternetDialogController implements AccessPointController.AccessPoi
Log.e(TAG, "Unexpected null telephony call back for Sub " + tm.getSubscriptionId()); Log.e(TAG, "Unexpected null telephony call back for Sub " + tm.getSubscriptionId());
} }
} }
mSubIdTelephonyManagerMap.clear();
mSubIdTelephonyCallbackMap.clear();
mSubIdTelephonyDisplayInfoMap.clear();
mSubscriptionManager.removeOnSubscriptionsChangedListener( mSubscriptionManager.removeOnSubscriptionsChangedListener(
mOnSubscriptionsChangedListener); mOnSubscriptionsChangedListener);
mAccessPointController.removeAccessPointCallback(this); mAccessPointController.removeAccessPointCallback(this);

21
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java
View File

@@ -43,6 +43,7 @@ import android.telephony.ServiceState;
import android.telephony.SignalStrength; import android.telephony.SignalStrength;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyDisplayInfo; import android.telephony.TelephonyDisplayInfo;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
@@ -961,6 +962,26 @@ public class InternetDialogControllerTest extends SysuiTestCase {
assertThat(dds).contains(mContext.getString(R.string.carrier_network_change_mode)); assertThat(dds).contains(mContext.getString(R.string.carrier_network_change_mode));
} }
@Test
public void onStop_cleanUp() {
doReturn(SUB_ID).when(mTelephonyManager).getSubscriptionId();
assertThat(mInternetDialogController.mSubIdTelephonyManagerMap.get(SUB_ID)).isEqualTo(
mTelephonyManager);
assertThat(mInternetDialogController.mSubIdTelephonyCallbackMap.get(SUB_ID)).isNotNull();
mInternetDialogController.onStop();
verify(mTelephonyManager).unregisterTelephonyCallback(any(TelephonyCallback.class));
assertThat(mInternetDialogController.mSubIdTelephonyDisplayInfoMap.isEmpty()).isTrue();
assertThat(mInternetDialogController.mSubIdTelephonyManagerMap.isEmpty()).isTrue();
assertThat(mInternetDialogController.mSubIdTelephonyCallbackMap.isEmpty()).isTrue();
verify(mSubscriptionManager).removeOnSubscriptionsChangedListener(mInternetDialogController
.mOnSubscriptionsChangedListener);
verify(mAccessPointController).removeAccessPointCallback(mInternetDialogController);
verify(mConnectivityManager).unregisterNetworkCallback(
any(ConnectivityManager.NetworkCallback.class));
}
private String getResourcesString(String name) { private String getResourcesString(String name) {
return mContext.getResources().getString(getResourcesId(name)); return mContext.getResources().getString(getResourcesId(name));
} }