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

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

Merge "Subscription Manager public method clean up" am: 569cbcba 

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



Change-Id: Idbea16fcfc4afae916bf648c3482701961febc47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a116635 569cbcba

telephony/java/android/telephony/SubscriptionManager.java

+5 −10
Original line number Original line Diff line number Diff line
@@ -139,24 +139,19 @@ public class SubscriptionManager { 
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final Uri CONTENT_URI = SimInfo.CONTENT_URI;

    public static final Uri CONTENT_URI = SimInfo.CONTENT_URI;





    /** @hide */

    private static final String CACHE_KEY_DEFAULT_SUB_ID_PROPERTY =

    public static final String CACHE_KEY_DEFAULT_SUB_ID_PROPERTY =

            "cache_key.telephony.get_default_sub_id";

            "cache_key.telephony.get_default_sub_id";





    /** @hide */

    private static final String CACHE_KEY_DEFAULT_DATA_SUB_ID_PROPERTY =

    public static final String CACHE_KEY_DEFAULT_DATA_SUB_ID_PROPERTY =

            "cache_key.telephony.get_default_data_sub_id";

            "cache_key.telephony.get_default_data_sub_id";





    /** @hide */

    private static final String CACHE_KEY_DEFAULT_SMS_SUB_ID_PROPERTY =

    public static final String CACHE_KEY_DEFAULT_SMS_SUB_ID_PROPERTY =

            "cache_key.telephony.get_default_sms_sub_id";

            "cache_key.telephony.get_default_sms_sub_id";





    /** @hide */

    private static final String CACHE_KEY_ACTIVE_DATA_SUB_ID_PROPERTY =

    public static final String CACHE_KEY_ACTIVE_DATA_SUB_ID_PROPERTY =

            "cache_key.telephony.get_active_data_sub_id";

            "cache_key.telephony.get_active_data_sub_id";





    /** @hide */

    private static final String CACHE_KEY_SLOT_INDEX_PROPERTY =

    public static final String CACHE_KEY_SLOT_INDEX_PROPERTY =

            "cache_key.telephony.get_slot_index";

            "cache_key.telephony.get_slot_index";





    /** @hide */

    /** @hide */