Commit dae797a0 authored by Wei-Yin Chen (陳威尹)'s avatar Wei-Yin Chen (陳威尹) Committed by Commit Bot

Annotate CallSuper in AsyncInitializationActivity

Also add a missing call in BookmarkAddActivity.

Bug: None
Change-Id: Ic7a4d88e5677386f657134619eda9ae2e5b004aa
Reviewed-on: https://chromium-review.googlesource.com/572401
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487177}
parent 368afac8
...@@ -31,6 +31,7 @@ public class BookmarkAddActivity extends AsyncInitializationActivity { ...@@ -31,6 +31,7 @@ public class BookmarkAddActivity extends AsyncInitializationActivity {
@Override @Override
public void finishNativeInitialization() { public void finishNativeInitialization() {
super.finishNativeInitialization();
RecordUserAction.record("MobileAddBookmarkViaIntent"); RecordUserAction.record("MobileAddBookmarkViaIntent");
final String title = getIntent().getStringExtra(EXTRA_TITLE); final String title = getIntent().getStringExtra(EXTRA_TITLE);
......
...@@ -84,6 +84,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -84,6 +84,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
mHandler = new Handler(); mHandler = new Handler();
} }
@CallSuper
@Override @Override
protected void onDestroy() { protected void onDestroy() {
mDestroyed = true; mDestroyed = true;
...@@ -96,6 +97,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -96,6 +97,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
super.onDestroy(); super.onDestroy();
} }
@CallSuper
@Override @Override
@TargetApi(Build.VERSION_CODES.N) @TargetApi(Build.VERSION_CODES.N)
protected void attachBaseContext(Context newBase) { protected void attachBaseContext(Context newBase) {
...@@ -116,6 +118,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -116,6 +118,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
} }
} }
@CallSuper
@Override @Override
public void preInflationStartup() { public void preInflationStartup() {
mHadWarmStart = LibraryLoader.isInitialized(); mHadWarmStart = LibraryLoader.isInitialized();
...@@ -198,6 +201,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -198,6 +201,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
@Override @Override
public void initializeState() { } public void initializeState() { }
@CallSuper
@Override @Override
public void finishNativeInitialization() { public void finishNativeInitialization() {
// Set up the initial orientation of the device. // Set up the initial orientation of the device.
...@@ -214,6 +218,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -214,6 +218,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
mNativeInitializationController.onNativeInitializationComplete(); mNativeInitializationController.onNativeInitializationComplete();
} }
@CallSuper
@Override @Override
public void onStartupFailure() { public void onStartupFailure() {
ProcessInitException e = ProcessInitException e =
...@@ -280,6 +285,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -280,6 +285,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
/** /**
* Call to begin loading the library, if it was delayed. * Call to begin loading the library, if it was delayed.
*/ */
@CallSuper
protected void startDelayedNativeInitialization() { protected void startDelayedNativeInitialization() {
assert mStartupDelayed; assert mStartupDelayed;
mStartupDelayed = false; mStartupDelayed = false;
...@@ -357,12 +363,14 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -357,12 +363,14 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
mSavedInstanceState = null; mSavedInstanceState = null;
} }
@CallSuper
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
mNativeInitializationController.onStart(); mNativeInitializationController.onStart();
} }
@CallSuper
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
...@@ -372,6 +380,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -372,6 +380,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
mFirstResumePending = false; mFirstResumePending = false;
} }
@CallSuper
@Override @Override
public void onPause() { public void onPause() {
mNativeInitializationController.onPause(); mNativeInitializationController.onPause();
...@@ -379,6 +388,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -379,6 +388,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
if (mLaunchBehindWorkaround != null) mLaunchBehindWorkaround.onPause(); if (mLaunchBehindWorkaround != null) mLaunchBehindWorkaround.onPause();
} }
@CallSuper
@Override @Override
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
...@@ -386,6 +396,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -386,6 +396,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
mNativeInitializationController.onStop(); mNativeInitializationController.onStop();
} }
@CallSuper
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
if (intent == null) return; if (intent == null) return;
...@@ -393,11 +404,13 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -393,11 +404,13 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
setIntent(intent); setIntent(intent);
} }
@CallSuper
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
mNativeInitializationController.onActivityResult(requestCode, resultCode, data); mNativeInitializationController.onActivityResult(requestCode, resultCode, data);
} }
@CallSuper
@Override @Override
public final void onCreateWithNative() { public final void onCreateWithNative() {
try { try {
...@@ -432,6 +445,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -432,6 +445,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
@Override @Override
public abstract boolean shouldStartGpuProcess(); public abstract boolean shouldStartGpuProcess();
@CallSuper
@Override @Override
public void onContextMenuClosed(Menu menu) { public void onContextMenuClosed(Menu menu) {
if (mWindowAndroid != null) mWindowAndroid.onContextMenuClosed(); if (mWindowAndroid != null) mWindowAndroid.onContextMenuClosed();
...@@ -469,6 +483,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -469,6 +483,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
* This will handle passing {@link Intent} results back to the {@link WindowAndroid}. It will * This will handle passing {@link Intent} results back to the {@link WindowAndroid}. It will
* return whether or not the {@link WindowAndroid} has consumed the event or not. * return whether or not the {@link WindowAndroid} has consumed the event or not.
*/ */
@CallSuper
@Override @Override
public boolean onActivityResultWithNative(int requestCode, int resultCode, Intent intent) { public boolean onActivityResultWithNative(int requestCode, int resultCode, Intent intent) {
if (mWindowAndroid != null) { if (mWindowAndroid != null) {
...@@ -478,6 +493,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -478,6 +493,7 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
} }
} }
@CallSuper
@Override @Override
public void onRequestPermissionsResult( public void onRequestPermissionsResult(
int requestCode, String[] permissions, int[] grantResults) { int requestCode, String[] permissions, int[] grantResults) {
...@@ -489,18 +505,21 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -489,18 +505,21 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
super.onRequestPermissionsResult(requestCode, permissions, grantResults); super.onRequestPermissionsResult(requestCode, permissions, grantResults);
} }
@CallSuper
@Override @Override
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
if (mWindowAndroid != null) mWindowAndroid.saveInstanceState(outState); if (mWindowAndroid != null) mWindowAndroid.saveInstanceState(outState);
} }
@CallSuper
@Override @Override
public void onLowMemory() { public void onLowMemory() {
super.onLowMemory(); super.onLowMemory();
if (mMemoryUma != null) mMemoryUma.onLowMemory(); if (mMemoryUma != null) mMemoryUma.onLowMemory();
} }
@CallSuper
@Override @Override
public void onTrimMemory(int level) { public void onTrimMemory(int level) {
super.onTrimMemory(level); super.onTrimMemory(level);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment