Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java

Issue 1486053003: Android: Add support for TraceEvent before the native library is loaded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Proper locking. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
index fadf50d725f32ec5f98d018539bfe1c1dfa2386b..b02299df104fadef23146d0856fd21e2213b79e1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
@@ -168,19 +168,24 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
*/
@Override
protected final void onCreate(Bundle savedInstanceState) {
- if (!isStartedUpCorrectly(getIntent())) {
- sBadIntentMetric.recordHit();
- super.onCreate(null);
- ApiCompatibilityUtils.finishAndRemoveTask(this);
- return;
- }
+ TraceEvent.begin("AsyncInitializationActivity.onCreate()");
+ try {
+ if (!isStartedUpCorrectly(getIntent())) {
+ sBadIntentMetric.recordHit();
+ super.onCreate(null);
+ ApiCompatibilityUtils.finishAndRemoveTask(this);
+ return;
+ }
- super.onCreate(savedInstanceState);
- mOnCreateTimestampMs = SystemClock.elapsedRealtime();
- mOnCreateTimestampUptimeMs = SystemClock.uptimeMillis();
- mSavedInstanceState = savedInstanceState;
+ super.onCreate(savedInstanceState);
+ mOnCreateTimestampMs = SystemClock.elapsedRealtime();
+ mOnCreateTimestampUptimeMs = SystemClock.uptimeMillis();
+ mSavedInstanceState = savedInstanceState;
- ChromeBrowserInitializer.getInstance(this).handlePreNativeStartup(this);
+ ChromeBrowserInitializer.getInstance(this).handlePreNativeStartup(this);
+ } finally {
pasko 2015/12/15 17:52:59 I think a separate method would be slightly more r
Benoit L 2016/01/06 12:50:06 You're right, throwing from onCreate() is deadly,
+ TraceEvent.end("AsyncInitializationActivity.onCreate()");
+ }
}
/**

Powered by Google App Engine
This is Rietveld 408576698