diff options
| author | 2023-08-08 20:50:34 +0000 | |
|---|---|---|
| committer | 2023-08-08 20:50:34 +0000 | |
| commit | 1f1a545d90140a2ec892238698eddaa5e27cb6cb (patch) | |
| tree | 8bbf89a7833e73fde80810e4281bc3bcb2e2fc2d | |
| parent | 2c065639df06a539d92582874626db883685e19a (diff) | |
| parent | 4f3948d9aff96890db0c9321161ef4477849327d (diff) | |
Merge "activity(api): Expose isResumed for mainline module libs" into main am: 156bf47164 am: 4f3948d9af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2644833
Change-Id: I45c648989d315b055c5ba3fabd597d45ddf94382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/Activity.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index d27ff75fdf54..7cfa1e377933 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -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 { diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index e5494900717c..85026662a228 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -8915,6 +8915,7 @@ public class Activity extends ContextThemeWrapper * @hide */ @UnsupportedAppUsage + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public final boolean isResumed() { return mResumed; } |