From fbba7fb3b0ff69f93898e33c61b1971f2f69dcbe Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Tue, 16 Aug 2022 17:54:05 -0700 Subject: [PATCH] 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 --- .../android/telephony/SubscriptionManager.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index f28408e1abc9b..4fb65874044f6 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -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 */