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

Commit f656ea39 authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

Merge "Replace #apex with #systemapi" am: 777c8f5b am: adcc29f7 am:... 

Merge "Replace #apex with #systemapi" am: 777c8f5b am: adcc29f7 am: 7aea64e1 am: 0586474a am: c0a91173

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2155622



Change-Id: I3f2bd647f9e5c26b64c0d8a041944affdc3dce6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 221ca57d c0a91173

libs/adbd_auth/libadbd_auth.map.txt

+12 −12
Original line number Diff line number Diff line 
LIBADBD_AUTH {

  global:

    adbd_auth_new; # apex introduced=30

    adbd_auth_delete; # apex introduced=30

    adbd_auth_run; # apex introduced=30

    adbd_auth_get_public_keys; #apex introduced=30

    adbd_auth_notify_auth; # apex introduced=30

    adbd_auth_notify_disconnect; # apex introduced=30

    adbd_auth_prompt_user; # apex introduced=30

    adbd_auth_prompt_user_with_id; # apex introduced=30

    adbd_auth_tls_device_connected; # apex introduced=30

    adbd_auth_tls_device_disconnected; # apex introduced=30

    adbd_auth_get_max_version; # apex introduced=30

    adbd_auth_supports_feature; # apex introduced=30

    adbd_auth_new; # systemapi introduced=30

    adbd_auth_delete; # systemapi introduced=30

    adbd_auth_run; # systemapi introduced=30

    adbd_auth_get_public_keys; # systemapi introduced=30

    adbd_auth_notify_auth; # systemapi introduced=30

    adbd_auth_notify_disconnect; # systemapi introduced=30

    adbd_auth_prompt_user; # systemapi introduced=30

    adbd_auth_prompt_user_with_id; # systemapi introduced=30

    adbd_auth_tls_device_connected; # systemapi introduced=30

    adbd_auth_tls_device_disconnected; # systemapi introduced=30

    adbd_auth_get_max_version; # systemapi introduced=30

    adbd_auth_supports_feature; # systemapi introduced=30

  local:

    *;

};

libs/binder/ndk/libbinder_ndk.map.txt

+22 −22
Original line number Diff line number Diff line
@@ -89,12 +89,12 @@ LIBBINDER_NDK { # introduced=29 
    AStatus_getStatus;

    AStatus_isOk;

    AStatus_newOk;

    ABinderProcess_joinThreadPool; # apex llndk

    ABinderProcess_setThreadPoolMaxThreadCount; # apex llndk

    ABinderProcess_startThreadPool; # apex llndk

    AServiceManager_addService; # apex llndk

    AServiceManager_checkService; # apex llndk

    AServiceManager_getService; # apex llndk

    ABinderProcess_joinThreadPool; # systemapi llndk

    ABinderProcess_setThreadPoolMaxThreadCount; # systemapi llndk

    ABinderProcess_startThreadPool; # systemapi llndk

    AServiceManager_addService; # systemapi llndk

    AServiceManager_checkService; # systemapi llndk

    AServiceManager_getService; # systemapi llndk

};



LIBBINDER_NDK30 { # introduced=30
@@ -105,30 +105,30 @@ LIBBINDER_NDK30 { # introduced=30 
    AStatus_deleteDescription;

    AParcel_fromJavaParcel;



    AIBinder_markSystemStability; # apex

    AIBinder_markSystemStability; # systemapi

    AIBinder_markVendorStability; # llndk

    AIBinder_markVintfStability; # apex llndk

    AIBinder_Class_setHandleShellCommand; # apex llndk

    AIBinder_markVintfStability; # systemapi llndk

    AIBinder_Class_setHandleShellCommand; # systemapi llndk

};



LIBBINDER_NDK31 { # introduced=31

  global:

    ABinderProcess_handlePolledCommands; # apex

    ABinderProcess_setupPolling; # apex

    AIBinder_getCallingSid; # apex

    AIBinder_setRequestingSid; # apex

    ABinderProcess_handlePolledCommands; # systemapi

    ABinderProcess_setupPolling; # systemapi

    AIBinder_getCallingSid; # systemapi

    AIBinder_setRequestingSid; # systemapi

    AParcel_markSensitive; # systemapi llndk

    AServiceManager_forEachDeclaredInstance; # apex llndk

    AServiceManager_forceLazyServicesPersist; # apex llndk

    AServiceManager_isDeclared; # apex llndk

    AServiceManager_isUpdatableViaApex; # apex

    AServiceManager_forEachDeclaredInstance; # systemapi llndk

    AServiceManager_forceLazyServicesPersist; # systemapi llndk

    AServiceManager_isDeclared; # systemapi llndk

    AServiceManager_isUpdatableViaApex; # systemapi

    AServiceManager_reRegister; # llndk

    AServiceManager_registerLazyService; # apex llndk

    AServiceManager_registerLazyService; # systemapi llndk

    AServiceManager_setActiveServicesCallback; # llndk

    AServiceManager_tryUnregister; # llndk

    AServiceManager_waitForService; # apex llndk

    AServiceManager_waitForService; # systemapi llndk



    AIBinder_forceDowngradeToSystemStability; # apex

    AIBinder_forceDowngradeToSystemStability; # systemapi

    AIBinder_forceDowngradeToVendorStability; # llndk



    AIBinder_Class_getDescriptor;
@@ -146,8 +146,8 @@ LIBBINDER_NDK33 { # introduced=33 
    AIBinder_Class_disableInterfaceTokenHeader;

    AIBinder_DeathRecipient_setOnUnlinked;

    AIBinder_isHandlingTransaction;

    AIBinder_setInheritRt; # apex llndk

    AIBinder_setMinSchedulerPolicy; # apex llndk

    AIBinder_setInheritRt; # systemapi llndk

    AIBinder_setMinSchedulerPolicy; # systemapi llndk

    AParcel_marshal;

    AParcel_unmarshal;

};

libs/nativewindow/libnativewindow.map.txt

+10 −10
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ LIBNATIVEWINDOW { 
  global:

    AHardwareBuffer_acquire;

    AHardwareBuffer_allocate;

    AHardwareBuffer_createFromHandle; # llndk # apex

    AHardwareBuffer_createFromHandle; # llndk # systemapi

    AHardwareBuffer_describe;

    AHardwareBuffer_getId; # introduced=31

    AHardwareBuffer_getNativeHandle; # llndk # apex

    AHardwareBuffer_getNativeHandle; # llndk # systemapi

    AHardwareBuffer_isSupported; # introduced=29

    AHardwareBuffer_lock;

    AHardwareBuffer_lockAndGetInfo; # introduced=29
@@ -24,18 +24,18 @@ LIBNATIVEWINDOW { 
    ANativeWindow_getBuffersDefaultDataSpace; # introduced=34

    ANativeWindow_getFormat;

    ANativeWindow_getHeight;

    ANativeWindow_getLastDequeueDuration; # apex # introduced=30

    ANativeWindow_getLastDequeueStartTime; # apex # introduced=30

    ANativeWindow_getLastQueueDuration; # apex # introduced=30

    ANativeWindow_getLastDequeueDuration; # systemapi # introduced=30

    ANativeWindow_getLastDequeueStartTime; # systemapi # introduced=30

    ANativeWindow_getLastQueueDuration; # systemapi # introduced=30

    ANativeWindow_getWidth;

    ANativeWindow_lock;

    ANativeWindow_query; # llndk

    ANativeWindow_queryf; # llndk

    ANativeWindow_queueBuffer; # llndk

    ANativeWindow_setCancelBufferInterceptor; # apex # introduced=30

    ANativeWindow_setDequeueBufferInterceptor; # apex # introduced=30

    ANativeWindow_setPerformInterceptor; # apex # introduced=30

    ANativeWindow_setQueueBufferInterceptor; # apex # introduced=30

    ANativeWindow_setCancelBufferInterceptor; # systemapi # introduced=30

    ANativeWindow_setDequeueBufferInterceptor; # systemapi # introduced=30

    ANativeWindow_setPerformInterceptor; # systemapi # introduced=30

    ANativeWindow_setQueueBufferInterceptor; # systemapi # introduced=30

    ANativeWindow_release;

    ANativeWindow_setAutoPrerotation; # llndk

    ANativeWindow_setAutoRefresh; # llndk
@@ -46,7 +46,7 @@ LIBNATIVEWINDOW { 
    ANativeWindow_setBuffersGeometry;

    ANativeWindow_setBuffersTimestamp; # llndk

    ANativeWindow_setBuffersTransform;

    ANativeWindow_setDequeueTimeout; # apex # introduced=30

    ANativeWindow_setDequeueTimeout; # systemapi # introduced=30

    ANativeWindow_setFrameRate; # introduced=30

    ANativeWindow_setFrameRateWithChangeStrategy; # introduced=31

    ANativeWindow_setSharedBufferMode; # llndk