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

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

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

* commit '988108e80849a115fc0bc95aeb852b1e0793cd8c':
  Fix WebViewUpdateService timeout code.
parents 64fc3282 22a3bc8b

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

+1 −1
Original line number Diff line number Diff line
@@ -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;