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

Merge "Use SystemClock.elapsedRealtime() to record WebView startup timestamps." into sc-dev

Browse Source
This commit is contained in:
Anna Malova
2021-02-17 18:22:32 +00:00
committed by Android (Google) Code Review
parent ae759b075f f649ddfcea
commit 0845888808
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/webkit/WebViewFactory.java
View File

@@ -31,6 +31,7 @@ import android.content.pm.Signature;
import android.os.Build; import android.os.Build;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemClock;
import android.os.Trace; import android.os.Trace;
import android.util.AndroidRuntimeException; import android.util.AndroidRuntimeException;
import android.util.ArraySet; import android.util.ArraySet;
@@ -261,7 +262,7 @@ public final class WebViewFactory {
// us honest and minimize usage of WebView internals when binding the proxy. // us honest and minimize usage of WebView internals when binding the proxy.
if (sProviderInstance != null) return sProviderInstance; if (sProviderInstance != null) return sProviderInstance;
sTimestamps[WEBVIEW_LOAD_START] = System.currentTimeMillis(); sTimestamps[WEBVIEW_LOAD_START] = SystemClock.elapsedRealtime();
final int uid = android.os.Process.myUid(); final int uid = android.os.Process.myUid();
if (uid == android.os.Process.ROOT_UID || uid == android.os.Process.SYSTEM_UID if (uid == android.os.Process.ROOT_UID || uid == android.os.Process.SYSTEM_UID
|| uid == android.os.Process.PHONE_UID || uid == android.os.Process.NFC_UID || uid == android.os.Process.PHONE_UID || uid == android.os.Process.NFC_UID
@@ -401,7 +402,7 @@ public final class WebViewFactory {
Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW,
"initialApplication.createApplicationContext"); "initialApplication.createApplicationContext");
sTimestamps[CREATE_CONTEXT_START] = System.currentTimeMillis(); sTimestamps[CREATE_CONTEXT_START] = SystemClock.elapsedRealtime();
try { try {
// Construct an app context to load the Java code into the current app. // Construct an app context to load the Java code into the current app.
Context webViewContext = initialApplication.createApplicationContext( Context webViewContext = initialApplication.createApplicationContext(
@@ -410,7 +411,7 @@ public final class WebViewFactory {
sPackageInfo = newPackageInfo; sPackageInfo = newPackageInfo;
return webViewContext; return webViewContext;
} finally { } finally {
sTimestamps[CREATE_CONTEXT_END] = System.currentTimeMillis(); sTimestamps[CREATE_CONTEXT_END] = SystemClock.elapsedRealtime();
Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW); Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW);
} }
} catch (RemoteException | PackageManager.NameNotFoundException e) { } catch (RemoteException | PackageManager.NameNotFoundException e) {
@@ -436,26 +437,26 @@ public final class WebViewFactory {
Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.getChromiumProviderClass()"); Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.getChromiumProviderClass()");
try { try {
sTimestamps[ADD_ASSETS_START] = System.currentTimeMillis(); sTimestamps[ADD_ASSETS_START] = SystemClock.elapsedRealtime();
for (String newAssetPath : webViewContext.getApplicationInfo().getAllApkPaths()) { for (String newAssetPath : webViewContext.getApplicationInfo().getAllApkPaths()) {
initialApplication.getAssets().addAssetPathAsSharedLibrary(newAssetPath); initialApplication.getAssets().addAssetPathAsSharedLibrary(newAssetPath);
} }
sTimestamps[ADD_ASSETS_END] = sTimestamps[GET_CLASS_LOADER_START] = sTimestamps[ADD_ASSETS_END] = sTimestamps[GET_CLASS_LOADER_START] =
System.currentTimeMillis(); SystemClock.elapsedRealtime();
ClassLoader clazzLoader = webViewContext.getClassLoader(); ClassLoader clazzLoader = webViewContext.getClassLoader();
Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.loadNativeLibrary()"); Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.loadNativeLibrary()");
sTimestamps[GET_CLASS_LOADER_END] = sTimestamps[NATIVE_LOAD_START] = sTimestamps[GET_CLASS_LOADER_END] = sTimestamps[NATIVE_LOAD_START] =
System.currentTimeMillis(); SystemClock.elapsedRealtime();
WebViewLibraryLoader.loadNativeLibrary(clazzLoader, WebViewLibraryLoader.loadNativeLibrary(clazzLoader,
getWebViewLibrary(sPackageInfo.applicationInfo)); getWebViewLibrary(sPackageInfo.applicationInfo));
Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW); Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW);
Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "Class.forName()"); Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "Class.forName()");
sTimestamps[NATIVE_LOAD_END] = sTimestamps[PROVIDER_CLASS_FOR_NAME_START] = sTimestamps[NATIVE_LOAD_END] = sTimestamps[PROVIDER_CLASS_FOR_NAME_START] =
System.currentTimeMillis(); SystemClock.elapsedRealtime();
try { try {
return getWebViewProviderClass(clazzLoader); return getWebViewProviderClass(clazzLoader);
} finally { } finally {
sTimestamps[PROVIDER_CLASS_FOR_NAME_END] = System.currentTimeMillis(); sTimestamps[PROVIDER_CLASS_FOR_NAME_END] = SystemClock.elapsedRealtime();
Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW); Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW);
} }
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {