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
Merged-In: Ibf8907efd9dfcae5155c1b7b85a1411b61a13a77
Change-Id: Ibf8907efd9dfcae5155c1b7b85a1411b61a13a77
This commit is contained in:
Jack Yu
2022-08-16 17:54:05 -07:00
parent 1a90569c95
commit 24fae2f63d

View File

@@ -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 */