diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 76200e742bf91..9fa64feb30416 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -1889,30 +1889,6 @@ public class SubscriptionManager { } } - /** - * @return the count of all subscriptions in the database, this includes - * all subscriptions that have been seen. - * @hide - */ - @UnsupportedAppUsage - public int getAllSubscriptionInfoCount() { - if (VDBG) logd("[getAllSubscriptionInfoCount]+"); - - int result = 0; - - try { - ISub iSub = TelephonyManager.getSubscriptionService(); - if (iSub != null) { - result = iSub.getAllSubInfoCount(mContext.getOpPackageName(), - mContext.getAttributionTag()); - } - } catch (RemoteException ex) { - // ignore it - } - - return result; - } - /** * * Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} @@ -2311,12 +2287,6 @@ public class SubscriptionManager { } } - /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) - public int getDefaultSmsPhoneId() { - return getPhoneId(getDefaultSmsSubscriptionId()); - } - /** * Returns the system's default data subscription id. * @@ -2364,12 +2334,6 @@ public class SubscriptionManager { return getActiveSubscriptionInfo(getDefaultDataSubscriptionId()); } - /** @hide */ - @UnsupportedAppUsage - public int getDefaultDataPhoneId() { - return getPhoneId(getDefaultDataSubscriptionId()); - } - /** @hide */ public void clearSubscriptionInfo() { try { diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl index 1e38b9215d76d..917f35bc1b82c 100755 --- a/telephony/java/com/android/internal/telephony/ISub.aidl +++ b/telephony/java/com/android/internal/telephony/ISub.aidl @@ -29,14 +29,6 @@ interface ISub { */ List getAllSubInfoList(String callingPackage, String callingFeatureId); - /** - * @param callingPackage The package maing the call. - * @param callingFeatureId The feature in the package - * @return the count of all subscriptions in the database, this includes - * all subscriptions that have been seen. - */ - int getAllSubInfoCount(String callingPackage, String callingFeatureId); - /** * Get the active SubscriptionInfo with the subId key * @param subId The unique SubscriptionInfo key in database