Call ActivityCallbacks after corresponding activity methods

Test:  android.app.cts.ActivityCallbacksTest
bug:34415265
Change-Id: I1d8dd3a5c564c2036174a686aeb0eaf0883c0a55

5 files changed, 74 insertions, 17 deletions

diff --git a/api/current.txt b/api/current.txt
index e2616a6f9036..85aad97f2670 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4149,6 +4149,7 @@ package android.app {
     method public abstract void onActivityCreated(android.app.Activity, android.os.Bundle);
     method public abstract void onActivityDestroyed(android.app.Activity);
     method public abstract void onActivityPaused(android.app.Activity);
+    method public default void onActivityPreCreated(android.app.Activity, android.os.Bundle);
     method public abstract void onActivityResumed(android.app.Activity);
     method public abstract void onActivitySaveInstanceState(android.app.Activity, android.os.Bundle);
     method public abstract void onActivityStarted(android.app.Activity);
diff --git a/api/system-current.txt b/api/system-current.txt
index 21f15f273b5b..18abca0237f1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4291,6 +4291,7 @@ package android.app {
     method public abstract void onActivityCreated(android.app.Activity, android.os.Bundle);
     method public abstract void onActivityDestroyed(android.app.Activity);
     method public abstract void onActivityPaused(android.app.Activity);
+    method public default void onActivityPreCreated(android.app.Activity, android.os.Bundle);
     method public abstract void onActivityResumed(android.app.Activity);
     method public abstract void onActivitySaveInstanceState(android.app.Activity, android.os.Bundle);
     method public abstract void onActivityStarted(android.app.Activity);
diff --git a/api/test-current.txt b/api/test-current.txt
index 940f68bc7660..25c6dd681184 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -4159,6 +4159,7 @@ package android.app {
     method public abstract void onActivityCreated(android.app.Activity, android.os.Bundle);
     method public abstract void onActivityDestroyed(android.app.Activity);
     method public abstract void onActivityPaused(android.app.Activity);
+    method public default void onActivityPreCreated(android.app.Activity, android.os.Bundle);
     method public abstract void onActivityResumed(android.app.Activity);
     method public abstract void onActivitySaveInstanceState(android.app.Activity, android.os.Bundle);
     method public abstract void onActivityStarted(android.app.Activity);
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 1d84ff57d3c1..3e8258aa9c63 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -969,7 +969,9 @@ public class Activity extends ContextThemeWrapper
                     ? mLastNonConfigurationInstances.fragments : null);
         }
         mFragments.dispatchCreate();
-        getApplication().dispatchActivityCreated(this, savedInstanceState);
+        if (!isAtLeastO()) {
+            getApplication().dispatchActivityCreated(this, savedInstanceState);
+        }
         if (mVoiceInteractor != null) {
             mVoiceInteractor.attachActivity(this);
         }
@@ -1197,8 +1199,9 @@ public class Activity extends ContextThemeWrapper
         mCalled = true;
 
         mFragments.doLoaderStart();
-
-        getApplication().dispatchActivityStarted(this);
+        if (!isAtLeastO()) {
+            getApplication().dispatchActivityStarted(this);
+        }
     }
 
     /**
@@ -1259,7 +1262,9 @@ public class Activity extends ContextThemeWrapper
     @CallSuper
     protected void onResume() {
         if (DEBUG_LIFECYCLE) Slog.v(TAG, "onResume " + this);
-        getApplication().dispatchActivityResumed(this);
+        if (!isAtLeastO()) {
+            getApplication().dispatchActivityResumed(this);
+        }
         mActivityTransitionState.onResume(this, isTopOfTask());
         mCalled = true;
     }
@@ -1426,6 +1431,9 @@ public class Activity extends ContextThemeWrapper
         saveManagedDialogs(outState);
         mActivityTransitionState.saveState(outState);
         storeHasCurrentPermissionRequest(outState);
+        if (isAtLeastO()) {
+            getApplication().dispatchActivitySaveInstanceState(this, outState);
+        }
         if (DEBUG_LIFECYCLE) Slog.v(TAG, "onSaveInstanceState " + this + ": " + outState);
     }
 
@@ -1442,6 +1450,9 @@ public class Activity extends ContextThemeWrapper
         onSaveInstanceState(outState, outPersistentState);
         saveManagedDialogs(outState);
         storeHasCurrentPermissionRequest(outState);
+        if (isAtLeastO()) {
+            getApplication().dispatchActivitySaveInstanceState(this, outState);
+        }
         if (DEBUG_LIFECYCLE) Slog.v(TAG, "onSaveInstanceState " + this + ": " + outState +
                 ", " + outPersistentState);
     }
@@ -1497,7 +1508,9 @@ public class Activity extends ContextThemeWrapper
         if (p != null) {
             outState.putParcelable(FRAGMENTS_TAG, p);
         }
-        getApplication().dispatchActivitySaveInstanceState(this, outState);
+        if (!isAtLeastO()) {
+            getApplication().dispatchActivitySaveInstanceState(this, outState);
+        }
     }
 
     /**
@@ -1595,7 +1608,9 @@ public class Activity extends ContextThemeWrapper
     @CallSuper
     protected void onPause() {
         if (DEBUG_LIFECYCLE) Slog.v(TAG, "onPause " + this);
-        getApplication().dispatchActivityPaused(this);
+        if (!isAtLeastO()) {
+            getApplication().dispatchActivityPaused(this);
+        }
         mCalled = true;
     }
 
@@ -1795,7 +1810,9 @@ public class Activity extends ContextThemeWrapper
         if (DEBUG_LIFECYCLE) Slog.v(TAG, "onStop " + this);
         if (mActionBar != null) mActionBar.setShowHideAnimationEnabled(false);
         mActivityTransitionState.onStop();
-        getApplication().dispatchActivityStopped(this);
+        if (!isAtLeastO()) {
+            getApplication().dispatchActivityStopped(this);
+        }
         mTranslucentCallback = null;
         mCalled = true;
     }
@@ -1865,8 +1882,9 @@ public class Activity extends ContextThemeWrapper
         if (mActionBar != null) {
             mActionBar.onDestroy();
         }
-
-        getApplication().dispatchActivityDestroyed(this);
+        if (!isAtLeastO()) {
+            getApplication().dispatchActivityDestroyed(this);
+        }
     }
 
     /**
@@ -6738,25 +6756,33 @@ public class Activity extends ContextThemeWrapper
         return mParent != null ? mParent.getActivityToken() : mToken;
     }
 
-    final void performCreateCommon() {
+    final void performCreateCommon(Bundle icicle) {
+        mActivityTransitionState.readState(icicle);
         mVisibleFromClient = !mWindow.getWindowStyle().getBoolean(
                 com.android.internal.R.styleable.Window_windowNoDisplay, false);
         mFragments.dispatchActivityCreated();
         mActivityTransitionState.setEnterActivityOptions(this, getActivityOptions());
+        if (isAtLeastO()) {
+            getApplication().dispatchActivityCreated(this, icicle);
+        }
     }
 
     final void performCreate(Bundle icicle) {
         restoreHasCurrentPermissionRequest(icicle);
+        if (isAtLeastO()) {
+            getApplication().dispatchActivityPreCreated(this, icicle);
+        }
         onCreate(icicle);
-        mActivityTransitionState.readState(icicle);
-        performCreateCommon();
+        performCreateCommon(icicle);
     }
 
     final void performCreate(Bundle icicle, PersistableBundle persistentState) {
         restoreHasCurrentPermissionRequest(icicle);
+        if (isAtLeastO()) {
+            getApplication().dispatchActivityPreCreated(this, icicle);
+        }
         onCreate(icicle, persistentState);
-        mActivityTransitionState.readState(icicle);
-        performCreateCommon();
+        performCreateCommon(icicle);
     }
 
     final void performStart() {
@@ -6799,6 +6825,9 @@ public class Activity extends ContextThemeWrapper
         }
 
         mActivityTransitionState.enterReady(this);
+        if (isAtLeastO()) {
+            getApplication().dispatchActivityStarted(this);
+        }
     }
 
     final void performRestart() {
@@ -6874,7 +6903,9 @@ public class Activity extends ContextThemeWrapper
 
         mFragments.dispatchResume();
         mFragments.execPendingActions();
-
+        if (isAtLeastO()) {
+            getApplication().dispatchActivityResumed(this);
+        }
         onPostResume();
         if (!mCalled) {
             throw new SuperNotCalledException(
@@ -6889,13 +6920,15 @@ public class Activity extends ContextThemeWrapper
         mCalled = false;
         onPause();
         mResumed = false;
+        if (isAtLeastO()) {
+            getApplication().dispatchActivityPaused(this);
+        }
         if (!mCalled && getApplicationInfo().targetSdkVersion
                 >= android.os.Build.VERSION_CODES.GINGERBREAD) {
             throw new SuperNotCalledException(
                     "Activity " + mComponent.toShortString() +
                     " did not call through to super.onPause()");
         }
-        mResumed = false;
     }
 
     final void performUserLeaving() {
@@ -6906,7 +6939,7 @@ public class Activity extends ContextThemeWrapper
     final void performStop(boolean preserveWindow) {
         mDoReportFullyDrawn = false;
         mFragments.doLoaderStop(mChangingConfigurations /*retain*/);
-
+        boolean dispatchActivityStopped = !mStopped;
         if (!mStopped) {
             if (mWindow != null) {
                 mWindow.closeAllPanels();
@@ -6943,6 +6976,9 @@ public class Activity extends ContextThemeWrapper
             mStopped = true;
         }
         mResumed = false;
+        if (dispatchActivityStopped && isAtLeastO()) {
+            getApplication().dispatchActivityStopped(this);
+        }
     }
 
     final void performDestroy() {
@@ -6954,6 +6990,13 @@ public class Activity extends ContextThemeWrapper
         if (mVoiceInteractor != null) {
             mVoiceInteractor.detachActivity();
         }
+        if (isAtLeastO()) {
+            getApplication().dispatchActivityDestroyed(this);
+        }
+    }
+
+    private boolean isAtLeastO() {
+        return getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O;
     }
 
     final void dispatchMultiWindowModeChanged(boolean isInMultiWindowMode) {
diff --git a/core/java/android/app/Application.java b/core/java/android/app/Application.java
index 156df36a600c..03efe68cb741 100644
--- a/core/java/android/app/Application.java
+++ b/core/java/android/app/Application.java
@@ -55,6 +55,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 {
     public LoadedApk mLoadedApk;
 
     public interface ActivityLifecycleCallbacks {
+        default void onActivityPreCreated(Activity activity, Bundle savedInstanceState) {}
         void onActivityCreated(Activity activity, Bundle savedInstanceState);
         void onActivityStarted(Activity activity);
         void onActivityResumed(Activity activity);
@@ -190,6 +191,16 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 {
         mLoadedApk = ContextImpl.getImpl(context).mPackageInfo;
     }
 
+    /* package */ void dispatchActivityPreCreated(Activity activity, Bundle savedInstanceState) {
+        Object[] callbacks = collectActivityLifecycleCallbacks();
+        if (callbacks != null) {
+            for (int i = 0; i < callbacks.length; i++) {
+                ((ActivityLifecycleCallbacks) callbacks[i]).onActivityPreCreated(activity,
+                        savedInstanceState);
+            }
+        }
+    }
+
     /* package */ void dispatchActivityCreated(Activity activity, Bundle savedInstanceState) {
         Object[] callbacks = collectActivityLifecycleCallbacks();
         if (callbacks != null) {