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

Commit fbba7fb3 authored by Jack Yu's avatar Jack Yu
Browse files

Subscription Manager public method clean up 

1. Preliminary step of subscription manager API surface clean up.
2. Simpler way to solve unit test issue
3. Fixed incorrect string comparison.

Bug: 239607619
Test: atest TelephonyFrameworksTests
Change-Id: Ibf8907efd9dfcae5155c1b7b85a1411b61a13a77
parent 07fad327

telephony/java/android/telephony/SubscriptionManager.java

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

    public static final Uri CONTENT_URI = SimInfo.CONTENT_URI;



    /** @hide */

    public static final String CACHE_KEY_DEFAULT_SUB_ID_PROPERTY =

    private static final String CACHE_KEY_DEFAULT_SUB_ID_PROPERTY =

            "cache_key.telephony.get_default_sub_id";



    /** @hide */

    public static final String CACHE_KEY_DEFAULT_DATA_SUB_ID_PROPERTY =

    private static final String CACHE_KEY_DEFAULT_DATA_SUB_ID_PROPERTY =

            "cache_key.telephony.get_default_data_sub_id";



    /** @hide */

    public static final String CACHE_KEY_DEFAULT_SMS_SUB_ID_PROPERTY =

    private static final String CACHE_KEY_DEFAULT_SMS_SUB_ID_PROPERTY =

            "cache_key.telephony.get_default_sms_sub_id";



    /** @hide */

    public static final String CACHE_KEY_ACTIVE_DATA_SUB_ID_PROPERTY =

    private static final String CACHE_KEY_ACTIVE_DATA_SUB_ID_PROPERTY =

            "cache_key.telephony.get_active_data_sub_id";



    /** @hide */

    public static final String CACHE_KEY_SLOT_INDEX_PROPERTY =

    private static final String CACHE_KEY_SLOT_INDEX_PROPERTY =

            "cache_key.telephony.get_slot_index";



    /** @hide */