Merge "Add metrics for Carrier Roaming NB-IoT NTN module" into main
diff --git a/flags/misc.aconfig b/flags/misc.aconfig
index e18b72a..053b328 100644
--- a/flags/misc.aconfig
+++ b/flags/misc.aconfig
@@ -98,17 +98,6 @@
# OWNER=rambowang TARGET=24Q3
flag {
- name: "fix_crash_on_getting_config_when_phone_is_gone"
- namespace: "telephony"
- description: "Fix VCN crash when calling CarrierConfigManager.getConfigForSubId while phone process has gone."
- bug:"319791612"
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
-
-# OWNER=rambowang TARGET=24Q3
-flag {
name: "add_anomaly_when_notify_config_changed_with_invalid_phone"
namespace: "telephony"
description: "Report anomaly when CarrierConfigLoader received config change with sub that maps to invalid phoneId"
@@ -118,17 +107,6 @@
}
}
-# OWNER=rambowang TARGET=24Q3
-flag {
- name: "hide_preinstalled_carrier_app_at_most_once"
- namespace: "telephony"
- description: "Fix bug when preloaded carrier app is uninstalled and lose provisioning data"
- bug:"158028151"
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
-
# OWNER=sangyun TARGET=24Q3
flag {
name: "roaming_notification_for_single_data_network"
diff --git a/flags/uicc.aconfig b/flags/uicc.aconfig
index f41fad3..14341d9 100644
--- a/flags/uicc.aconfig
+++ b/flags/uicc.aconfig
@@ -43,14 +43,6 @@
bug:"318348580"
}
-# OWNER=rambowang TARGET=24Q3
-flag {
- name: "cleanup_open_logical_channel_record_on_dispose"
- namespace: "telephony"
- description: "This flag cleans up the OpenLogicalChannelRecord once SIM is removed"
- bug:"335046531"
-}
-
# OWNER=arunvoddu TARGET=24Q4
flag {
name: "set_carrier_restriction_status"
diff --git a/src/java/com/android/internal/telephony/HalVersion.java b/src/java/com/android/internal/telephony/HalVersion.java
index bb839ce..c05111b 100644
--- a/src/java/com/android/internal/telephony/HalVersion.java
+++ b/src/java/com/android/internal/telephony/HalVersion.java
@@ -95,17 +95,8 @@
return less(ver) || equals(ver);
}
- /**
- * @return True if the version is between (excluding the two provided versions)
- */
- public boolean between(HalVersion greaterThan, HalVersion lessThan) {
- return greater(greaterThan) && less(lessThan);
- }
-
@Override
public String toString() {
- if (equals(UNSUPPORTED)) return "UNSUPPORTED";
- if (equals(UNKNOWN)) return "UNKNOWN";
return major + "." + minor;
}
}
diff --git a/src/java/com/android/internal/telephony/InboundSmsHandler.java b/src/java/com/android/internal/telephony/InboundSmsHandler.java
index 37d8aa6..891f3f4 100644
--- a/src/java/com/android/internal/telephony/InboundSmsHandler.java
+++ b/src/java/com/android/internal/telephony/InboundSmsHandler.java
@@ -305,9 +305,9 @@
mResolver = context.getContentResolver();
mWapPush = new WapPushOverSms(context, mFeatureFlags);
- boolean smsCapable = mContext.getResources().getBoolean(
- com.android.internal.R.bool.config_sms_capable);
- mSmsReceiveDisabled = !TelephonyManager.from(mContext).getSmsReceiveCapableForPhone(
+ TelephonyManager telephonyManager = TelephonyManager.from(mContext);
+ boolean smsCapable = telephonyManager.isDeviceSmsCapable();
+ mSmsReceiveDisabled = !telephonyManager.getSmsReceiveCapableForPhone(
mPhone.getPhoneId(), smsCapable);
PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 84568b6..88ead6f 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -949,8 +949,8 @@
break;
}
- if (serviceProxy.isEmpty() && mHalVersion.get(service).between(
- RADIO_HAL_VERSION_UNSUPPORTED, RADIO_HAL_VERSION_2_0)) {
+ if (serviceProxy.isEmpty()
+ && mHalVersion.get(service).less(RADIO_HAL_VERSION_2_0)) {
try {
mHalVersion.put(service, RADIO_HAL_VERSION_1_6);
serviceProxy.setHidl(mHalVersion.get(service),
@@ -960,8 +960,8 @@
}
}
- if (serviceProxy.isEmpty() && mHalVersion.get(service).between(
- RADIO_HAL_VERSION_UNSUPPORTED, RADIO_HAL_VERSION_2_0)) {
+ if (serviceProxy.isEmpty()
+ && mHalVersion.get(service).less(RADIO_HAL_VERSION_2_0)) {
try {
mHalVersion.put(service, RADIO_HAL_VERSION_1_5);
serviceProxy.setHidl(mHalVersion.get(service),
@@ -971,8 +971,8 @@
}
}
- if (serviceProxy.isEmpty() && mHalVersion.get(service).between(
- RADIO_HAL_VERSION_UNSUPPORTED, RADIO_HAL_VERSION_2_0)) {
+ if (serviceProxy.isEmpty()
+ && mHalVersion.get(service).less(RADIO_HAL_VERSION_2_0)) {
try {
mHalVersion.put(service, RADIO_HAL_VERSION_1_4);
serviceProxy.setHidl(mHalVersion.get(service),
@@ -982,8 +982,8 @@
}
}
- if (serviceProxy.isEmpty() && mHalVersion.get(service).between(
- RADIO_HAL_VERSION_UNKNOWN, RADIO_HAL_VERSION_2_0)) {
+ if (serviceProxy.isEmpty()
+ && mHalVersion.get(service).less(RADIO_HAL_VERSION_2_0)) {
riljLoge("IRadio <1.4 is no longer supported.");
}
@@ -1617,8 +1617,7 @@
@Override
public void supplySimDepersonalization(PersoSubState persoType, String controlKey,
Message result) {
- if (mHalVersion.get(HAL_SERVICE_SIM).between(
- RADIO_HAL_VERSION_UNKNOWN, RADIO_HAL_VERSION_1_5)
+ if (mHalVersion.get(HAL_SERVICE_SIM).less(RADIO_HAL_VERSION_1_5)
&& PersoSubState.PERSOSUBSTATE_SIM_NETWORK == persoType) {
supplyNetworkDepersonalization(controlKey, result);
return;
@@ -3019,8 +3018,7 @@
@Override
public void setAllowedNetworkTypesBitmap(
@TelephonyManager.NetworkTypeBitMask int networkTypeBitmask, Message result) {
- if (mHalVersion.get(HAL_SERVICE_NETWORK).between(
- RADIO_HAL_VERSION_UNKNOWN, RADIO_HAL_VERSION_1_6)) {
+ if (mHalVersion.get(HAL_SERVICE_NETWORK).less(RADIO_HAL_VERSION_1_6)) {
// For older HAL, redirects the call to setPreferredNetworkType.
setPreferredNetworkType(
RadioAccessFamily.getNetworkTypeFromRaf(networkTypeBitmask), result);
diff --git a/src/java/com/android/internal/telephony/SMSDispatcher.java b/src/java/com/android/internal/telephony/SMSDispatcher.java
index 7d8786e..2f2b62a 100644
--- a/src/java/com/android/internal/telephony/SMSDispatcher.java
+++ b/src/java/com/android/internal/telephony/SMSDispatcher.java
@@ -255,8 +255,7 @@
mContext.getContentResolver().registerContentObserver(Settings.Global.getUriFor(
Settings.Global.SMS_SHORT_CODE_RULE), false, mSettingsObserver);
- mSmsCapable = mContext.getResources().getBoolean(
- com.android.internal.R.bool.config_sms_capable);
+ mSmsCapable = mTelephonyManager.isDeviceSmsCapable();
mSmsSendDisabled = !mTelephonyManager.getSmsSendCapableForPhone(
mPhone.getPhoneId(), mSmsCapable);
IntentFilter intentFilter = new IntentFilter();
diff --git a/src/java/com/android/internal/telephony/uicc/UiccPort.java b/src/java/com/android/internal/telephony/uicc/UiccPort.java
index 9e341ef..905db70 100644
--- a/src/java/com/android/internal/telephony/uicc/UiccPort.java
+++ b/src/java/com/android/internal/telephony/uicc/UiccPort.java
@@ -31,7 +31,6 @@
import com.android.internal.telephony.TelephonyComponentFactory;
import com.android.internal.telephony.flags.FeatureFlags;
import com.android.internal.telephony.flags.FeatureFlagsImpl;
-import com.android.internal.telephony.flags.Flags;
import com.android.telephony.Rlog;
import java.io.FileDescriptor;
@@ -442,15 +441,13 @@
* channel that may have been assigned to other client.
*/
private void cleanupOpenLogicalChannelRecordsIfNeeded() {
- if (Flags.cleanupOpenLogicalChannelRecordOnDispose()) {
- synchronized (mOpenChannelRecords) {
- for (OpenLogicalChannelRecord record : mOpenChannelRecords) {
- if (DBG) log("Clean up " + record);
- record.mRequest.binder.unlinkToDeath(record, /*flags=*/ 0);
- record.mRequest.binder = null;
- }
- mOpenChannelRecords.clear();
+ synchronized (mOpenChannelRecords) {
+ for (OpenLogicalChannelRecord record : mOpenChannelRecords) {
+ if (DBG) log("Clean up " + record);
+ record.mRequest.binder.unlinkToDeath(record, /*flags=*/ 0);
+ record.mRequest.binder = null;
}
+ mOpenChannelRecords.clear();
}
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java b/tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java
index e06e4fe..cb37d88 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java
@@ -23,7 +23,6 @@
import android.os.Bundle;
import android.os.CarrierAssociatedAppEntry;
import android.os.UserHandle;
-import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.test.mock.MockContentProvider;
@@ -35,12 +34,9 @@
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
-import com.android.internal.telephony.flags.Flags;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
-import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
@@ -63,9 +59,6 @@
private static final int USER_ID = 12345;
private static final String CALLING_PACKAGE = "phone";
- @Rule
- public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
// Mocked classes
private Context mContext;
private PackageManager mPackageManager;
@@ -86,7 +79,6 @@
@Before
public void setUp() throws Exception {
- mSetFlagsRule.enableFlags(Flags.FLAG_HIDE_PREINSTALLED_CARRIER_APP_AT_MOST_ONCE);
System.setProperty("dexmaker.dexcache",
InstrumentationRegistry.getTargetContext().getCacheDir().getPath());
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
diff --git a/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccPortTest.java b/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccPortTest.java
index 5c1993f..a2b42af 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccPortTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccPortTest.java
@@ -29,7 +29,6 @@
import static org.mockito.Mockito.verify;
import android.os.Binder;
-import android.platform.test.flag.junit.SetFlagsRule;
import android.telephony.TelephonyManager;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
@@ -38,11 +37,9 @@
import com.android.internal.telephony.IccLogicalChannelRequest;
import com.android.internal.telephony.TelephonyTest;
-import com.android.internal.telephony.flags.Flags;
import org.junit.After;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -61,13 +58,9 @@
private int mPhoneId = 0;
- @Rule
- public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
@Before
public void setUp() throws Exception {
super.setUp(getClass().getSimpleName());
- mSetFlagsRule.enableFlags(Flags.FLAG_CLEANUP_OPEN_LOGICAL_CHANNEL_RECORD_ON_DISPOSE);
mUiccCard = mock(UiccCard.class);
mIccCardStatus = mock(IccCardStatus.class);
/* initially there are no application available */