Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c909c948 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by android-build-merger
Browse files

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

am: b52dfe67

Change-Id: If4f84926076a3fc6ffa860b7075bb669b1cfb21c
parents 925000d6 b52dfe67

telephony/java/com/android/internal/telephony/SmsMessageBase.java

+7 −3
Original line number Diff line number Diff line
@@ -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;
@@ -403,9 +402,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;
@@ -421,6 +420,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.

     */