Device didn't renew the allowed network types
Bug: 189185335
Test: build pass.
atest PhoneInterfaceManagerTest (PASS)
Change-Id: Ic041e204fd488f88d340471c8489cce92f11bf24
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 9a7260a..4c58436 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -137,6 +137,7 @@
import com.android.ims.ImsManager;
import com.android.ims.internal.IImsServiceFeatureCallback;
import com.android.ims.rcs.uce.eab.EabUtil;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.CallForwardInfo;
import com.android.internal.telephony.CallManager;
import com.android.internal.telephony.CallStateException;
@@ -7601,13 +7602,7 @@
getDefaultDataEnabled());
setNetworkSelectionModeAutomatic(subId);
Phone phone = getPhone(subId);
- if (phone != null) {
- SubscriptionManager.setSubscriptionProperty(subId,
- SubscriptionManager.ALLOWED_NETWORK_TYPES,
- "user=" + RadioAccessFamily.getRafFromNetworkType(
- RILConstants.PREFERRED_NETWORK_MODE));
- phone.loadAllowedNetworksFromSubscriptionDatabase();
- }
+ cleanUpAllowedNetworkTypes(phone, subId);
setDataRoamingEnabled(subId, getDefaultDataRoamingEnabled(subId));
getPhone(subId).resetCarrierKeysForImsiEncryption();
}
@@ -7638,6 +7633,21 @@
}
}
+ @VisibleForTesting
+ void cleanUpAllowedNetworkTypes(Phone phone, int subId) {
+ if (phone == null || !SubscriptionManager.isUsableSubscriptionId(subId)) {
+ return;
+ }
+ long defaultNetworkType = RadioAccessFamily.getRafFromNetworkType(
+ RILConstants.PREFERRED_NETWORK_MODE);
+ SubscriptionManager.setSubscriptionProperty(subId,
+ SubscriptionManager.ALLOWED_NETWORK_TYPES,
+ "user=" + defaultNetworkType);
+ phone.loadAllowedNetworksFromSubscriptionDatabase();
+ phone.setAllowedNetworkTypes(TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
+ defaultNetworkType, null);
+ }
+
private void cleanUpSmsRawTable(Context context) {
ContentResolver resolver = context.getContentResolver();
Uri uri = Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, "raw/permanentDelete");
diff --git a/tests/src/com/android/phone/PhoneInterfaceManagerTest.java b/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
new file mode 100644
index 0000000..fe5d013
--- /dev/null
+++ b/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2021 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.phone;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.content.pm.PackageManager;
+import android.telephony.RadioAccessFamily;
+import android.telephony.TelephonyManager;
+
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.TelephonyTestBase;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.RILConstants;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+
+/**
+ * Unit Test for CarrierConfigLoader.
+ */
+@RunWith(AndroidJUnit4.class)
+public class PhoneInterfaceManagerTest extends TelephonyTestBase {
+ private PhoneInterfaceManager mPhoneInterfaceManager;
+
+ @Mock
+ PhoneGlobals mPhoneGlobals;
+ @Mock
+ Phone mPhone;
+ @Mock
+ PackageManager mPackageManager;
+
+ @Before
+ @UiThreadTest
+ public void setUp() throws Exception {
+ super.setUp();
+ doReturn(mPackageManager).when(mPhoneGlobals).getPackageManager();
+ doReturn(false).when(mPackageManager).hasSystemFeature(
+ PackageManager.FEATURE_TELEPHONY_IMS);
+ mPhoneInterfaceManager = PhoneInterfaceManager.init(mPhoneGlobals);
+ }
+
+ @Test
+ public void cleanUpAllowedNetworkTypes_validPhoneAndSubId_doSetAllowedNetwork() {
+ long defaultNetworkType = RadioAccessFamily.getRafFromNetworkType(
+ RILConstants.PREFERRED_NETWORK_MODE);
+
+ mPhoneInterfaceManager.cleanUpAllowedNetworkTypes(mPhone, 1);
+
+ verify(mPhone).loadAllowedNetworksFromSubscriptionDatabase();
+ verify(mPhone).setAllowedNetworkTypes(TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
+ defaultNetworkType, null);
+ }
+
+ @Test
+ public void cleanUpAllowedNetworkTypes_validPhoneAndInvalidSubId_doNotSetAllowedNetwork() {
+ long defaultNetworkType = RadioAccessFamily.getRafFromNetworkType(
+ RILConstants.PREFERRED_NETWORK_MODE);
+
+ mPhoneInterfaceManager.cleanUpAllowedNetworkTypes(mPhone, -1);
+
+ verify(mPhone, never()).loadAllowedNetworksFromSubscriptionDatabase();
+ verify(mPhone, never()).setAllowedNetworkTypes(
+ TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER, defaultNetworkType, null);
+ }
+}
