Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b790cd6b authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge changes from topic "unused_sm_methods" am: 9e760081 am: 48c8df8a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2459493



Change-Id: I862df55e863e8d62715d079cbf2bcdbfc827289a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dda45add 48c8df8a

telephony/java/android/telephony/SubscriptionManager.java

+0 −36
Original line number Diff line number Diff line
@@ -1890,30 +1890,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}
@@ -2312,12 +2288,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.

     *
@@ -2365,12 +2335,6 @@ public class SubscriptionManager { 
        return getActiveSubscriptionInfo(getDefaultDataSubscriptionId());

    }



    /** @hide */

    @UnsupportedAppUsage

    public int getDefaultDataPhoneId() {

        return getPhoneId(getDefaultDataSubscriptionId());

    }



    /** @hide */

    public void clearSubscriptionInfo() {

        try {

telephony/java/com/android/internal/telephony/ISub.aidl

+0 −8
Original line number Diff line number Diff line
@@ -30,14 +30,6 @@ interface ISub { 
     */

    List<SubscriptionInfo> 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