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

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

Merge "Removed unused methods" am: f36b2d32 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2459868



Change-Id: I05b060fe74b29f80c444c2fe0ef714cbbc30b592
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c737cf11 f36b2d32

src/java/com/android/internal/telephony/SubscriptionController.java

+0 −6
Original line number Diff line number Diff line
@@ -1052,7 +1052,6 @@ public class SubscriptionController extends ISub.Stub { 
     * @param callingFeatureId The feature in the package

     * @return all SIM count in database, include what was inserted before

     */

    @Override

    public int getAllSubInfoCount(String callingPackage, String callingFeatureId) {

        if (DBG) logd("[getAllSubInfoCount]+");
@@ -3407,12 +3406,7 @@ public class SubscriptionController extends ISub.Stub { 
            pw.println(" defaultDataSubId=" + getDefaultDataSubId());

            pw.println(" defaultVoiceSubId=" + getDefaultVoiceSubId());

            pw.println(" defaultSmsSubId=" + getDefaultSmsSubId());



            pw.println(" defaultDataPhoneId=" + SubscriptionManager

                    .from(mContext).getDefaultDataPhoneId());

            pw.println(" defaultVoicePhoneId=" + SubscriptionManager.getDefaultVoicePhoneId());

            pw.println(" defaultSmsPhoneId=" + SubscriptionManager

                    .from(mContext).getDefaultSmsPhoneId());

            pw.flush();



            for (Entry<Integer, ArrayList<Integer>> entry : mSlotIndexToSubIds.entrySet()) {

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+0 −13
Original line number Diff line number Diff line
@@ -92,19 +92,6 @@ public class SubscriptionManagerService extends ISub.Stub { 
        return null;

    }



    /**

     * @param callingPackage The package making 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.

     */

    @Override

    public int getAllSubInfoCount(@NonNull String callingPackage,

            @NonNull String callingFeatureId) {

        return 0;

    }



    /**

     * Get the active {@link SubscriptionInfo} with the subscription id key.

     *