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

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

Merge changes from topics "framework-nfc-apex", "framework-nfc-hidden-api" into main 

* changes:
  hiddenapi: Enable nfc to perform its own hidden API processing
  boot(api): Add framework-nfc to NFC apex
parents 308de078 bfb2e310

boot/Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -26,9 +26,10 @@ package { 
soong_config_module_type {

    name: "custom_platform_bootclasspath",

    module_type: "platform_bootclasspath",

    config_namespace: "AUTO",

    config_namespace: "bootclasspath",

    bool_variables: [

        "car_bootclasspath_fragment",

        "nfc_apex_bootclasspath_fragment",

    ],

    properties: [

        "fragments",
@@ -155,6 +156,15 @@ custom_platform_bootclasspath { 
                },

            ],

        },

        nfc_apex_bootclasspath_fragment: {

            fragments: [

                // only used if NFC mainline is enabled.

                {

                    apex: "com.android.nfcservices",

                    module: "com.android.nfcservices-bootclasspath-fragment",

                },

            ],

        },

    },



    // Additional information needed by hidden api processing.

boot/hiddenapi/hiddenapi-max-target-o.txt

+0 −643

File changed.

Preview size limit exceeded, changes collapsed.

boot/hiddenapi/hiddenapi-max-target-r-loprio.txt

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ Landroid/Manifest$permission;->READ_FRAME_BUFFER:Ljava/lang/String; 
Landroid/media/IVolumeController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IVolumeController;

Landroid/net/INetworkPolicyListener$Stub;-><init>()V

Landroid/net/sip/ISipSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/sip/ISipSession;

Landroid/nfc/INfcAdapter$Stub;->TRANSACTION_enable:I

Landroid/os/IPowerManager$Stub;->TRANSACTION_acquireWakeLock:I

Landroid/os/IPowerManager$Stub;->TRANSACTION_goToSleep:I

Landroid/service/euicc/IEuiccService$Stub;-><init>()V

nfc/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ java_sdk_library { 
    lint: {

        strict_updatability_linting: true,

    },

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

    ],

}



filegroup {