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

Commit 6a0d43f0 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles)
Browse files

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
parent 487315f8

services/core/java/com/android/server/webkit/WebViewUpdateService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ public class WebViewUpdateService extends SystemService { 




            final long NS_PER_MS = 1000000;

            final long NS_PER_MS = 1000000;

            final long timeoutTimeMs = System.nanoTime() / NS_PER_MS + WAIT_TIMEOUT_MS;

            final long timeoutTimeMs = System.nanoTime() / NS_PER_MS + WAIT_TIMEOUT_MS;

            boolean relroReady = false;

            boolean relroReady = (is64Bit ? mRelroReady64Bit : mRelroReady32Bit);

            synchronized (WebViewUpdateService.this) {

            synchronized (WebViewUpdateService.this) {

                while (!relroReady) {

                while (!relroReady) {

                    final long timeNowMs = System.nanoTime() / NS_PER_MS;

                    final long timeNowMs = System.nanoTime() / NS_PER_MS;