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

Commit 1f1a545d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "activity(api): Expose isResumed for mainline module libs" into main am:... 

Merge "activity(api): Expose isResumed for mainline module libs" into main am: 156bf471 am: 4f3948d9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2644833



Change-Id: I45c648989d315b055c5ba3fabd597d45ddf94382
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c065639 4f3948d9

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ package android.app { 


  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {

    method public final boolean addDumpable(@NonNull android.util.Dumpable);

    method public final boolean isResumed();

  }



  public class ActivityManager {

core/java/android/app/Activity.java

+1 −0
Original line number Diff line number Diff line
@@ -8915,6 +8915,7 @@ public class Activity extends ContextThemeWrapper 
     * @hide

     */

    @UnsupportedAppUsage

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public final boolean isResumed() {

        return mResumed;

    }