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"

Browse Source 
am: 4257da213d

Change-Id: Iadaa0efcbc4ee9f5cecca4140132009044ba8503
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-22 10:15:56 -08:00
committed by android-build-merger
parent e74637df68 4257da213d
commit d6900e4b3c
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.os.Build;
import android.provider.Telephony; import android.provider.Telephony;
import android.telephony.SmsMessage; import android.telephony.SmsMessage;
import android.text.Emoji;
import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails; import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;
@@ -404,9 +403,9 @@ public abstract class SmsMessageBase {
if (!breakIterator.isBoundary(nextPos)) { if (!breakIterator.isBoundary(nextPos)) {
int breakPos = breakIterator.preceding(nextPos); int breakPos = breakIterator.preceding(nextPos);
while (breakPos + 4 <= nextPos while (breakPos + 4 <= nextPos
&& Emoji.isRegionalIndicatorSymbol( && isRegionalIndicatorSymbol(
Character.codePointAt(msgBody, breakPos)) Character.codePointAt(msgBody, breakPos))
&& Emoji.isRegionalIndicatorSymbol( && isRegionalIndicatorSymbol(
Character.codePointAt(msgBody, breakPos + 2))) { Character.codePointAt(msgBody, breakPos + 2))) {
// skip forward over flags (pairs of Regional Indicator Symbol) // skip forward over flags (pairs of Regional Indicator Symbol)
breakPos += 4; breakPos += 4;
@@ -422,6 +421,11 @@ public abstract class SmsMessageBase {
return nextPos; 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. * Calculate the TextEncodingDetails of a message encoded in Unicode.
*/ */