From 051b787c41866a4c9a16bca767b144fbf121276e Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Tue, 18 Feb 2025 13:28:21 -0800 Subject: Cleaned up the flag enforce_telephony_feature_mapping_for_public_apis Cleaned up the 24Q3 flag enforce_telephony_feature_mapping_for_public_apis Test: Basic telephony functionality tests Test: atest FrameworksTelephonyTests Bug: 297989574 Flag: EXEMPT flag cleanup Change-Id: If41ad237f55baa9df032564a5316d216e9d5838b --- telephony/java/android/telephony/euicc/EuiccManager.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'telephony') diff --git a/telephony/java/android/telephony/euicc/EuiccManager.java b/telephony/java/android/telephony/euicc/EuiccManager.java index ca4a643d7b20..ae7346eb6df4 100644 --- a/telephony/java/android/telephony/euicc/EuiccManager.java +++ b/telephony/java/android/telephony/euicc/EuiccManager.java @@ -1737,13 +1737,8 @@ public class EuiccManager { private int getCardIdForDefaultEuicc() { int cardId = TelephonyManager.UNINITIALIZED_CARD_ID; - if (Flags.enforceTelephonyFeatureMappingForPublicApis()) { - PackageManager pm = mContext.getPackageManager(); - if (pm != null && pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_EUICC)) { - TelephonyManager tm = mContext.getSystemService(TelephonyManager.class); - cardId = tm.getCardIdForDefaultEuicc(); - } - } else { + PackageManager pm = mContext.getPackageManager(); + if (pm != null && pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_EUICC)) { TelephonyManager tm = mContext.getSystemService(TelephonyManager.class); cardId = tm.getCardIdForDefaultEuicc(); } -- cgit v1.2.3-59-g8ed1b