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

Commit 162ae2a1 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

Expand @FlaggedApi(Flags.FLAG) in *all* API signature files 

A previous CL added the auto-generated aconfig Flags.FLAG sources to
metalava's input when generating core/api/current.txt, so metalava would
expand the Flags.FLAG to their values.

Do the same for the build targets for the other (system, module-lib,
test) API signature files in core/api.

Also update the API signature files accordingly.

Bug: 301859633
Test: m checkapi
Change-Id: Id06d77e897ecfddeaa42f75cba4d6d37bee9d1b1
parent 6c29a6fb

api/StubLibraries.bp

+9 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ module_libs = " --show-annotation android.annotation.SystemApi\\(" + 


droidstubs {

    name: "system-api-stubs-docs-non-updatable",

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",
@@ -126,6 +129,9 @@ droidstubs { 


droidstubs {

    name: "test-api-stubs-docs-non-updatable",

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",
@@ -173,6 +179,9 @@ droidstubs { 


droidstubs {

    name: "module-lib-api-stubs-docs-non-updatable",

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",

core/api/module-lib-current.txt

+12 −12
Original line number Diff line number Diff line
@@ -556,24 +556,24 @@ package android.provider { 


package android.se.omapi {



  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public class SeFrameworkInitializer {

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public static android.se.omapi.SeServiceManager getSeServiceManager();

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public static void setSeServiceManager(@NonNull android.se.omapi.SeServiceManager);

  @FlaggedApi("android.nfc.enable_nfc_mainline") public class SeFrameworkInitializer {

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @Nullable public static android.se.omapi.SeServiceManager getSeServiceManager();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public static void setSeServiceManager(@NonNull android.se.omapi.SeServiceManager);

  }



  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public class SeServiceManager {

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.se.omapi.SeServiceManager.ServiceRegisterer getSeManagerServiceRegisterer();

  @FlaggedApi("android.nfc.enable_nfc_mainline") public class SeServiceManager {

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public android.se.omapi.SeServiceManager.ServiceRegisterer getSeManagerServiceRegisterer();

  }



  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public static class SeServiceManager.ServiceNotFoundException extends java.lang.Exception {

    ctor @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public SeServiceManager.ServiceNotFoundException(@NonNull String);

  @FlaggedApi("android.nfc.enable_nfc_mainline") public static class SeServiceManager.ServiceNotFoundException extends java.lang.Exception {

    ctor @FlaggedApi("android.nfc.enable_nfc_mainline") public SeServiceManager.ServiceNotFoundException(@NonNull String);

  }



  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public static final class SeServiceManager.ServiceRegisterer {

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public android.os.IBinder get();

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.os.IBinder getOrThrow() throws android.se.omapi.SeServiceManager.ServiceNotFoundException;

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void register(@NonNull android.os.IBinder);

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public android.os.IBinder tryGet();

  @FlaggedApi("android.nfc.enable_nfc_mainline") public static final class SeServiceManager.ServiceRegisterer {

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @Nullable public android.os.IBinder get();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public android.os.IBinder getOrThrow() throws android.se.omapi.SeServiceManager.ServiceNotFoundException;

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void register(@NonNull android.os.IBinder);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @Nullable public android.os.IBinder tryGet();

  }



}

core/api/system-current.txt

+80 −80

File changed.

Preview size limit exceeded, changes collapsed.