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

Commit 22a3bc8b authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Android Git Automerger
Browse files

am 3ca863fd: Merge "Fix WebViewUpdateService timeout code." into lmp-dev 

* commit '3ca863fd6a6978428317bb592212afb24ca03e57':
  Fix WebViewUpdateService timeout code.
parents a3a1c8bc c4bbf384

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;