commit 8f1f74e23964d3f96a985b9ae5b477ff9c39dabb
author Petar Šegina <psegina@google.com> Thu Sep 07 14:26:28 2017 +0100
committer Petar Šegina <psegina@google.com> Fri Sep 08 14:22:33 2017 +0100
tree 8244dcddf6bb4ecab7d3022e2d6b2459f7cbdf2f
parent 3a92fb632b6509610c5c3bf2a117631816a56899

Move consumer call outside of the branch

Test: bit FrameworksCoreTests:android.text.LayoutTest
Change-Id: I4fae9d2b16c22e7ab3856959edc5a57f4276f22f

core/java/android/text/Layout.java

diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 5b750f9..25f791b 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1732,14 +1732,12 @@
                     float left = Math.min(h1, h2);
                     float right = Math.max(h1, h2);
 
-                    final boolean isRtl = (dirs.mDirections[i + 1] & RUN_RTL_FLAG) != 0;
-                    if (isRtl) {
-                        consumer.accept(left, top, right, bottom,
-                                TEXT_SELECTION_LAYOUT_RIGHT_TO_LEFT);
-                    } else {
-                        consumer.accept(left, top, right, bottom,
-                                TEXT_SELECTION_LAYOUT_LEFT_TO_RIGHT);
-                    }
+                    final @TextSelectionLayout int layout =
+                            ((dirs.mDirections[i + 1] & RUN_RTL_FLAG) != 0)
+                                    ? TEXT_SELECTION_LAYOUT_RIGHT_TO_LEFT
+                                    : TEXT_SELECTION_LAYOUT_LEFT_TO_RIGHT;
+
+                    consumer.accept(left, top, right, bottom, layout);
                 }
             }
         }