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

Commit 3559bf22 authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Android Git Automerger
Browse files

am cc3d920a: am d3143a3f: am e1fcced6: Merge "Make unicodeWrap() return null... 

am cc3d920a: am d3143a3f: am e1fcced6: Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev

* commit 'cc3d920a':
  Make unicodeWrap() return null if the input string is null.
parents 4dddb17c cc3d920a

core/java/android/text/BidiFormatter.java

+4 −2
Original line number Diff line number Diff line
@@ -377,9 +377,11 @@ public final class BidiFormatter { 
     *        See {@link TextDirectionHeuristics} for pre-defined heuristics.

     * @param isolate Whether to directionally isolate the string to prevent it from garbling the

     *     content around it

     * @return Input string after applying the above processing.

     * @return Input string after applying the above processing. {@code null} if {@code str} is

     *     {@code null}.

     */

    public String unicodeWrap(String str, TextDirectionHeuristic heuristic, boolean isolate) {

        if (str == null) return null;

        final boolean isRtl = heuristic.isRtl(str, 0, str.length());

        StringBuilder result = new StringBuilder();

        if (getStereoReset() && isolate) {