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

Merge "webview: add trace event for relro timeout." into tm-dev am: db243f1fe1 am: d8aa1435cb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18888975

Change-Id: I8793d2da9b663ed767e97c3ac908834d3a5b594d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Richard (Torne) Coles
2022-06-16 18:32:20 +00:00
committed by Automerger Merge Worker
parent 453cb7ff3f d8aa1435cb
commit 89e3195dea
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java
View File

@@ -21,6 +21,7 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.Signature; import android.content.pm.Signature;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Trace;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.Slog; import android.util.Slog;
import android.webkit.UserPackage; import android.webkit.UserPackage;
@@ -265,10 +266,12 @@ class WebViewUpdateServiceImpl {
// Either the current relro creation isn't done yet, or the new relro creatioin // Either the current relro creation isn't done yet, or the new relro creatioin
// hasn't kicked off yet (the last relro creation used an out-of-date WebView). // hasn't kicked off yet (the last relro creation used an out-of-date WebView).
webViewStatus = WebViewFactory.LIBLOAD_FAILED_WAITING_FOR_RELRO; webViewStatus = WebViewFactory.LIBLOAD_FAILED_WAITING_FOR_RELRO;
Slog.e(TAG, "Timed out waiting for relro creation, relros started " String timeoutError = "Timed out waiting for relro creation, relros started "
+ mNumRelroCreationsStarted + mNumRelroCreationsStarted
+ " relros finished " + mNumRelroCreationsFinished + " relros finished " + mNumRelroCreationsFinished
+ " package dirty? " + mWebViewPackageDirty); + " package dirty? " + mWebViewPackageDirty;
Slog.e(TAG, timeoutError);
Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, timeoutError);
} }
} }
if (!webViewReady) Slog.w(TAG, "creating relro file timed out"); if (!webViewReady) Slog.w(TAG, "creating relro file timed out");