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

Commit 58f23a8e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents ace49e05 af27dfc3

core/api/module-lib-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +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 {

  @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 addDumpable(@NonNull android.util.Dumpable);

    method public final boolean isResumed();

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

  }

  }





  public class ActivityManager {

  public class ActivityManager {

core/java/android/app/Activity.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import android.annotation.CallSuper; 
import android.annotation.CallbackExecutor;

import android.annotation.CallbackExecutor;

import android.annotation.ColorInt;

import android.annotation.ColorInt;

import android.annotation.DrawableRes;

import android.annotation.DrawableRes;

import android.annotation.FlaggedApi;

import android.annotation.IdRes;

import android.annotation.IdRes;

import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.LayoutRes;

import android.annotation.LayoutRes;
@@ -79,6 +80,7 @@ import android.graphics.drawable.Icon; 
import android.media.AudioManager;

import android.media.AudioManager;

import android.media.session.MediaController;

import android.media.session.MediaController;

import android.net.Uri;

import android.net.Uri;

import android.nfc.Flags;

import android.os.BadParcelableException;

import android.os.BadParcelableException;

import android.os.Build;

import android.os.Build;

import android.os.Bundle;

import android.os.Bundle;
@@ -8915,6 +8917,7 @@ public class Activity extends ContextThemeWrapper 
     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public final boolean isResumed() {

    public final boolean isResumed() {

        return mResumed;

        return mResumed;