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

Commit c4bbf384 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Android (Google) Code Review
Browse files

Merge "Fix WebViewUpdateService timeout code." into lmp-dev

parents 2d28d6e1 6a0d43f0

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;