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

Commit ff5659fb authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Revert "Call ActivityCallbacks after corresponding activity methods" 

This reverts commit 660cf30e.

bug: 34415265
bug: 34914977
Test: chrome launches

Change-Id: I170365fd47313bafb0d722e6d55ee119336137c4
parent 3084ec2d

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -4171,7 +4171,6 @@ 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);

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -4313,7 +4313,6 @@ 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);

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -4181,7 +4181,6 @@ 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);

core/java/android/app/Activity.java

+17 −60
Original line number Diff line number Diff line
@@ -969,9 +969,7 @@ public class Activity extends ContextThemeWrapper 
                    ? mLastNonConfigurationInstances.fragments : null);

        }

        mFragments.dispatchCreate();

        if (!isAtLeastO()) {

        getApplication().dispatchActivityCreated(this, savedInstanceState);

        }

        if (mVoiceInteractor != null) {

            mVoiceInteractor.attachActivity(this);

        }
@@ -1199,10 +1197,9 @@ public class Activity extends ContextThemeWrapper 
        mCalled = true;



        mFragments.doLoaderStart();

        if (!isAtLeastO()) {



        getApplication().dispatchActivityStarted(this);

    }

    }



    /**

     * Called after {@link #onStop} when the current activity is being
@@ -1262,9 +1259,7 @@ public class Activity extends ContextThemeWrapper 
    @CallSuper

    protected void onResume() {

        if (DEBUG_LIFECYCLE) Slog.v(TAG, "onResume " + this);

        if (!isAtLeastO()) {

        getApplication().dispatchActivityResumed(this);

        }

        mActivityTransitionState.onResume(this, isTopOfTask());

        mCalled = true;

    }
@@ -1431,9 +1426,6 @@ 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);

    }
@@ -1450,9 +1442,6 @@ 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);

    }
@@ -1508,10 +1497,8 @@ public class Activity extends ContextThemeWrapper 
        if (p != null) {

            outState.putParcelable(FRAGMENTS_TAG, p);

        }

        if (!isAtLeastO()) {

        getApplication().dispatchActivitySaveInstanceState(this, outState);

    }

    }



    /**

     * This is the same as {@link #onSaveInstanceState} but is called for activities
@@ -1608,9 +1595,7 @@ public class Activity extends ContextThemeWrapper 
    @CallSuper

    protected void onPause() {

        if (DEBUG_LIFECYCLE) Slog.v(TAG, "onPause " + this);

        if (!isAtLeastO()) {

        getApplication().dispatchActivityPaused(this);

        }

        mCalled = true;

    }
@@ -1810,9 +1795,7 @@ public class Activity extends ContextThemeWrapper 
        if (DEBUG_LIFECYCLE) Slog.v(TAG, "onStop " + this);

        if (mActionBar != null) mActionBar.setShowHideAnimationEnabled(false);

        mActivityTransitionState.onStop();

        if (!isAtLeastO()) {

        getApplication().dispatchActivityStopped(this);

        }

        mTranslucentCallback = null;

        mCalled = true;

    }
@@ -1882,10 +1865,9 @@ public class Activity extends ContextThemeWrapper 
        if (mActionBar != null) {

            mActionBar.onDestroy();

        }

        if (!isAtLeastO()) {



        getApplication().dispatchActivityDestroyed(this);

    }

    }



    /**

     * Report to the system that your app is now fully drawn, purely for diagnostic
@@ -6768,33 +6750,25 @@ public class Activity extends ContextThemeWrapper 
        return mParent != null ? mParent.getActivityToken() : mToken;

    }



    final void performCreateCommon(Bundle icicle) {

        mActivityTransitionState.readState(icicle);

    final void performCreateCommon() {

        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);

        performCreateCommon(icicle);

        mActivityTransitionState.readState(icicle);

        performCreateCommon();

    }



    final void performCreate(Bundle icicle, PersistableBundle persistentState) {

        restoreHasCurrentPermissionRequest(icicle);

        if (isAtLeastO()) {

            getApplication().dispatchActivityPreCreated(this, icicle);

        }

        onCreate(icicle, persistentState);

        performCreateCommon(icicle);

        mActivityTransitionState.readState(icicle);

        performCreateCommon();

    }



    final void performStart() {
@@ -6837,9 +6811,6 @@ public class Activity extends ContextThemeWrapper 
        }



        mActivityTransitionState.enterReady(this);

        if (isAtLeastO()) {

            getApplication().dispatchActivityStarted(this);

        }

    }



    final void performRestart() {
@@ -6915,9 +6886,7 @@ public class Activity extends ContextThemeWrapper 


        mFragments.dispatchResume();

        mFragments.execPendingActions();

        if (isAtLeastO()) {

            getApplication().dispatchActivityResumed(this);

        }



        onPostResume();

        if (!mCalled) {

            throw new SuperNotCalledException(
@@ -6932,15 +6901,13 @@ 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() {
@@ -6951,7 +6918,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();
@@ -6988,9 +6955,6 @@ public class Activity extends ContextThemeWrapper 
            mStopped = true;

        }

        mResumed = false;

        if (dispatchActivityStopped && isAtLeastO()) {

            getApplication().dispatchActivityStopped(this);

        }

    }



    final void performDestroy() {
@@ -7002,13 +6966,6 @@ 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) {

core/java/android/app/Application.java

+0 −11
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 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);
@@ -191,16 +190,6 @@ 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) {