Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct cache use in SubscriptionManager"

Browse Source
This commit is contained in:
Lee Shombert
2022-08-11 14:43:50 +00:00
committed by Android (Google) Code Review
parent f3e41e9a7d 0d9ec2f351
commit e8e1cd9211
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -194,13 +194,24 @@ public class SubscriptionManager {
}
@Override
public T recompute(Void aVoid) {
public T recompute(Void query) {
// This always throws on any error. The exceptions must be handled outside
// the cache.
try {
return mInterfaceMethod.applyOrThrow(TelephonyManager.getSubscriptionService());
} catch (Exception re) {
throw new RuntimeException(re);
}
}
@Override
public T query(Void query) {
T result = mDefaultValue;
try {
ISub iSub = TelephonyManager.getSubscriptionService();
if (iSub != null) {
result = mInterfaceMethod.applyOrThrow(iSub);
result = super.query(query);
}
} catch (Exception ex) {
Rlog.w(LOG_TAG, "Failed to recompute cache key for " + mCacheKeyProperty);
@@ -229,12 +240,24 @@ public class SubscriptionManager {
@Override
public T recompute(Integer query) {
// This always throws on any error. The exceptions must be handled outside
// the cache.
try {
return mInterfaceMethod.applyOrThrow(
TelephonyManager.getSubscriptionService(), query);
} catch (Exception re) {
throw new RuntimeException(re);
}
}
@Override
public T query(Integer query) {
T result = mDefaultValue;
try {
ISub iSub = TelephonyManager.getSubscriptionService();
if (iSub != null) {
result = mInterfaceMethod.applyOrThrow(iSub, query);
result = super.query(query);
}
} catch (Exception ex) {
Rlog.w(LOG_TAG, "Failed to recompute cache key for " + mCacheKeyProperty);
@@ -4118,4 +4141,3 @@ public class SubscriptionManager {
usageSetting, subscriptionId, mContext.getOpPackageName()));
}
}