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

Commit a8664e1d authored by Richard (Torne) Coles's avatar Richard (Torne) Coles Committed by Automerger Merge Worker
Browse files

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

Merge "webview: add trace event for relro timeout." into tm-dev am: db243f1f am: d8aa1435 am: 89e3195d

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



Change-Id: I9283aec83a38af3e14fa1bd1917487ea42e311bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8094d96c 89e3195d

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -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");