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

Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol" am: 4257da213d

Browse Source 
am: d6900e4b3c

Change-Id: I86c741f7ede242568aab436f673000c9f0da5813
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-22 10:22:02 -08:00
committed by android-build-merger
parent dd682aacaf d6900e4b3c
commit b52dfe672f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/com/android/internal/telephony/SmsMessageBase.java
View File

@@ -20,7 +20,6 @@ import android.annotation.UnsupportedAppUsage;
import android.os.Build;
import android.provider.Telephony;
import android.telephony.SmsMessage;
import android.text.Emoji;
import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;
@@ -404,9 +403,9 @@ public abstract class SmsMessageBase {
if (!breakIterator.isBoundary(nextPos)) {
int breakPos = breakIterator.preceding(nextPos);
while (breakPos + 4 <= nextPos
&& Emoji.isRegionalIndicatorSymbol(
&& isRegionalIndicatorSymbol(
Character.codePointAt(msgBody, breakPos))
&& Emoji.isRegionalIndicatorSymbol(
&& isRegionalIndicatorSymbol(
Character.codePointAt(msgBody, breakPos + 2))) {
// skip forward over flags (pairs of Regional Indicator Symbol)
breakPos += 4;
@@ -422,6 +421,11 @@ public abstract class SmsMessageBase {
return nextPos;
}
private static boolean isRegionalIndicatorSymbol(int codePoint) {
/** Based on http://unicode.org/Public/emoji/3.0/emoji-sequences.txt */
return 0x1F1E6 <= codePoint && codePoint <= 0x1F1FF;
}
/**
* Calculate the TextEncodingDetails of a message encoded in Unicode.
*/