From cd595f1998b1331fe0efba02d96c95ee43e791da Mon Sep 17 00:00:00 2001
From: Deepanshu Gupta <deepanshu@google.com>
Date: Tue, 7 Jul 2015 14:38:39 -0700
Subject: [PATCH] Fix Paint_Delegate.native_getRunAdvance()

Bug: 22249573
Change-Id: I29f7abe6448f439059547e1c1e310d3d651ac2d8
---
 .../layoutlib/bridge/src/android/graphics/Paint_Delegate.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java
index 57dd429ac6b18..65b65ec759d04 100644
--- a/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java
@@ -1171,8 +1171,9 @@ public class Paint_Delegate {
         float[] advances = new float[count];
         native_getTextRunAdvances(nativePaint, nativeTypeface, text, start, count,
                 contextStart, contextEnd - contextStart, isRtl, advances, 0);
+        int startOffset = offset - start;  // offset from start.
         float sum = 0;
-        for (int i = 0; i < offset; i++) {
+        for (int i = 0; i < startOffset; i++) {
             sum += advances[i];
         }
         return sum;