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

Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads.

Browse Source 
Bug: 160733170
Test: Sanity; Telephony unit tests; hard to reproduce
Change-Id: If8347a27a79351e84060c9a35e1cc9efd468f7a0
This commit is contained in:
Jeff Sharkey
2020-06-25 20:13:07 -06:00
committed by Shuo Qian
parent 56ec0b95bc
commit 131781145d
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java
View File

@@ -65,13 +65,7 @@ public class Sms7BitEncodingTranslator {
return "";
}
if (!mIs7BitTranslationTableLoaded) {
mTranslationTableCommon = new SparseIntArray();
mTranslationTableGSM = new SparseIntArray();
mTranslationTableCDMA = new SparseIntArray();
load7BitTranslationTableFromXml();
mIs7BitTranslationTableLoaded = true;
}
ensure7BitTranslationTableLoaded();
if ((mTranslationTableCommon != null && mTranslationTableCommon.size() > 0) ||
(mTranslationTableGSM != null && mTranslationTableGSM.size() > 0) ||
@@ -115,6 +109,8 @@ public class Sms7BitEncodingTranslator {
*/
int translation = -1;
ensure7BitTranslationTableLoaded();
if (mTranslationTableCommon != null) {
translation = mTranslationTableCommon.get(c, -1);
}
@@ -155,6 +151,18 @@ public class Sms7BitEncodingTranslator {
}
}
private static void ensure7BitTranslationTableLoaded() {
synchronized (Sms7BitEncodingTranslator.class) {
if (!mIs7BitTranslationTableLoaded) {
mTranslationTableCommon = new SparseIntArray();
mTranslationTableGSM = new SparseIntArray();
mTranslationTableCDMA = new SparseIntArray();
load7BitTranslationTableFromXml();
mIs7BitTranslationTableLoaded = true;
}
}
}
/**
* Load the whole translation table file from the framework resource
* encoded in XML.