Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torne (Richard Coles)
2014-08-01 17:48:51 +00:00
committed by Android (Google) Code Review
parent 2d28d6e1af 6a0d43f09d
commit c4bbf3848c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/webkit/WebViewUpdateService.java
View File

@@ -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;