From 6a0d43f09d8329bfe4709c05d2ce060cfbfba8b8 Mon Sep 17 00:00:00 2001
From: "Torne (Richard Coles)" <torne@google.com>
Date: Fri, 1 Aug 2014 18:40:20 +0100
Subject: [PATCH] Fix WebViewUpdateService timeout code.

The loop was initialising the boolean incorrectly causing the first
iteration to wait even when the condition was already true and have to
hit the timeout before loading continues.

Change-Id: I6a347cff2e4560b38c8aec3297e456b6f784a97e
---
 .../java/com/android/server/webkit/WebViewUpdateService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateService.java b/services/core/java/com/android/server/webkit/WebViewUpdateService.java
index ff68cf7e8158e..d4c5f8716c0e3 100644
--- a/services/core/java/com/android/server/webkit/WebViewUpdateService.java
+++ b/services/core/java/com/android/server/webkit/WebViewUpdateService.java
@@ -117,7 +117,7 @@ public class WebViewUpdateService extends SystemService {
 
             final long NS_PER_MS = 1000000;
             final long timeoutTimeMs = System.nanoTime() / NS_PER_MS + WAIT_TIMEOUT_MS;
-            boolean relroReady = false;
+            boolean relroReady = (is64Bit ? mRelroReady64Bit : mRelroReady32Bit);
             synchronized (WebViewUpdateService.this) {
                 while (!relroReady) {
                     final long timeNowMs = System.nanoTime() / NS_PER_MS;