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

Commit c30046eb authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge "activity(api): Flag nfc mainline API added for Android V" into main

parents b654506f 0ce1c1f9

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,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();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public final boolean isResumed();

  }



  public class ActivityManager {

core/java/android/app/Activity.java

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

     */

    @UnsupportedAppUsage

    @FlaggedApi(android.nfc.Flags.FLAG_ENABLE_NFC_MAINLINE)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public final boolean isResumed() {

        return mResumed;