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

2 files changed, 2 insertions, 0 deletions

diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 6a4c67b71250..5d599698ea55 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -13,6 +13,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 {
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index f5fa139aeb0a..8fc2fa796f88 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -8637,6 +8637,7 @@ public class Activity extends ContextThemeWrapper
      * @hide
      */
     @UnsupportedAppUsage
+    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
     public final boolean isResumed() {
         return mResumed;
     }