filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: Use try-with-resource

Browse Source 
Change-Id: I6649517cbd990502dfcb54f078764cf05f210268
This commit is contained in:
Michael W
2024-12-26 15:54:37 +01:00
parent 2a09fa3cb9
commit 9538179c75
24 changed files with 199 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android/support/v7/mms/DefaultApnSettingsLoader.java
+1 -7
View File
@@ -399,9 +399,7 @@ class DefaultApnSettingsLoader implements ApnSettingsLoader {
return;
}
// MCC/MNC is good, loading/querying APNs from XML
XmlResourceParser xml = null;
try {
xml = mContext.getResources().getXml(R.xml.apns);
try (XmlResourceParser xml = mContext.getResources().getXml(R.xml.apns)) {
new ApnsXmlParser(xml, apnValues -> {
final String mcc = trimWithNullCheck(apnValues.getAsString(APN_MCC));
final String mnc = trimWithNullCheck(apnValues.getAsString(APN_MNC));
@@ -425,10 +423,6 @@ class DefaultApnSettingsLoader implements ApnSettingsLoader {
}).parse();
} catch (final Resources.NotFoundException e) {
Log.w(MmsService.TAG, "Can not get apns.xml " + e);
} finally {
if (xml != null) {
xml.close();
}
}
}
src/android/support/v7/mms/DefaultCarrierConfigValuesLoader.java
+1 -7
View File
@@ -92,9 +92,7 @@ class DefaultCarrierConfigValuesLoader implements CarrierConfigValuesLoader {
private void loadFromResources(final int subId, final Bundle values) {
// Get a subscription-dependent context for loading the mms_config.xml
final Context subContext = Utils.getSubDepContext(mContext, subId);
XmlResourceParser xml = null;
try {
xml = subContext.getResources().getXml(R.xml.mms_config);
try (XmlResourceParser xml = subContext.getResources().getXml(R.xml.mms_config)) {
new CarrierConfigXmlParser(xml, (type, key, value) -> {
try {
if (KEY_TYPE_INT.equals(type)) {
@@ -111,10 +109,6 @@ class DefaultCarrierConfigValuesLoader implements CarrierConfigValuesLoader {
}).parse();
} catch (final Resources.NotFoundException e) {
Log.w(MmsService.TAG, "Can not get mms_config.xml");
} finally {
if (xml != null) {
xml.close();
}
}
}
}