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

Commit a0f73258 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Adde back check to make sure Activity.recreate() is called on main thread." into pi-dev 

am: 5f8e42f7

Change-Id: I9c110947941b4ccb9404b350eb507ec30e701ffc
parents 23d103bc 5f8e42f7

core/java/android/app/Activity.java

+3 −0
Original line number Diff line number Diff line
@@ -5580,6 +5580,9 @@ public class Activity extends ContextThemeWrapper 
        if (mParent != null) {

            throw new IllegalStateException("Can only be called on top-level activity");

        }

        if (Looper.myLooper() != mMainThread.getLooper()) {

            throw new IllegalStateException("Must be called from main thread");

        }

        mMainThread.scheduleRelaunchActivity(mToken);

    }