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

Commit 53142a94 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7510676 from 6c9d4040 to sc-d1-release 

Change-Id: Ib4c741f16378c40466598282542e398fe75d6682
parents 4731428a 6c9d4040

libs/binder/LazyServiceRegistrar.cpp

+40 −25
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ public: 


    void setActiveServicesCallback(const std::function<bool(bool)>& activeServicesCallback);



    bool tryUnregister();

    bool tryUnregisterLocked();



    void reRegister();

    void reRegisterLocked();



protected:

    Status onClients(const sp<IBinder>& service, bool clients) override;
@@ -59,6 +59,9 @@ private: 
        bool registered = true;

    };



    bool registerServiceLocked(const sp<IBinder>& service, const std::string& name,

                               bool allowIsolated, int dumpFlags);



    /**

     * Looks up a service guaranteed to be registered (service from onClients).

     */
@@ -68,7 +71,7 @@ private: 
     * Unregisters all services that we can. If we can't unregister all, re-register other

     * services.

     */

    void tryShutdown();

    void tryShutdownLocked();



    /**

     * Try to shutdown the process, unless:
@@ -76,7 +79,10 @@ private: 
     * - The active services count callback returns 'true', or

     * - Some services have clients.

     */

    void maybeTryShutdown();

    void maybeTryShutdownLocked();



    // for below

    std::mutex mMutex;



    // count of services with clients

    size_t mNumConnectedServices;
@@ -117,6 +123,13 @@ private: 


bool ClientCounterCallbackImpl::registerService(const sp<IBinder>& service, const std::string& name,

                                            bool allowIsolated, int dumpFlags) {

    std::lock_guard<std::mutex> lock(mMutex);

    return registerServiceLocked(service, name, allowIsolated, dumpFlags);

}



bool ClientCounterCallbackImpl::registerServiceLocked(const sp<IBinder>& service,

                                                      const std::string& name, bool allowIsolated,

                                                      int dumpFlags) {

    auto manager = interface_cast<AidlServiceManager>(asBinder(defaultServiceManager()));



    bool reRegister = mRegisteredServices.count(name) > 0;
@@ -164,14 +177,15 @@ std::map<std::string, ClientCounterCallbackImpl::Service>::iterator ClientCounte 
}



void ClientCounterCallbackImpl::forcePersist(bool persist) {

    std::lock_guard<std::mutex> lock(mMutex);

    mForcePersist = persist;

    if (!mForcePersist) {

        // Attempt a shutdown in case the number of clients hit 0 while the flag was on

        maybeTryShutdown();

        maybeTryShutdownLocked();

    }

}



bool ClientCounterCallbackImpl::tryUnregister() {

bool ClientCounterCallbackImpl::tryUnregisterLocked() {

    auto manager = interface_cast<AidlServiceManager>(asBinder(defaultServiceManager()));



    for (auto& [name, entry] : mRegisteredServices) {
@@ -187,15 +201,14 @@ bool ClientCounterCallbackImpl::tryUnregister() { 
    return true;

}



void ClientCounterCallbackImpl::reRegister() {

void ClientCounterCallbackImpl::reRegisterLocked() {

    for (auto& [name, entry] : mRegisteredServices) {

        // re-register entry if not already registered

        if (entry.registered) {

            continue;

        }



        if (!registerService(entry.service, name, entry.allowIsolated,

                             entry.dumpFlags)) {

        if (!registerServiceLocked(entry.service, name, entry.allowIsolated, entry.dumpFlags)) {

            // Must restart. Otherwise, clients will never be able to get a hold of this service.

            LOG_ALWAYS_FATAL("Bad state: could not re-register services");

        }
@@ -204,7 +217,7 @@ void ClientCounterCallbackImpl::reRegister() { 
    }

}



void ClientCounterCallbackImpl::maybeTryShutdown() {

void ClientCounterCallbackImpl::maybeTryShutdownLocked() {

    if (mForcePersist) {

        ALOGI("Shutdown prevented by forcePersist override flag.");

        return;
@@ -223,15 +236,12 @@ void ClientCounterCallbackImpl::maybeTryShutdown() { 
    // client count change event, try to shutdown the process if its services

    // have no clients.

    if (!handledInCallback && mNumConnectedServices == 0) {

        tryShutdown();

        tryShutdownLocked();

    }

}



/**

 * onClients is oneway, so no need to worry about multi-threading. Note that this means multiple

 * invocations could occur on different threads however.

 */

Status ClientCounterCallbackImpl::onClients(const sp<IBinder>& service, bool clients) {

    std::lock_guard<std::mutex> lock(mMutex);

    auto & [name, registered] = *assertRegisteredService(service);

    if (registered.clients == clients) {

        LOG_ALWAYS_FATAL("Process already thought %s had clients: %d but servicemanager has "
@@ -252,23 +262,24 @@ Status ClientCounterCallbackImpl::onClients(const sp<IBinder>& service, bool cli 
    ALOGI("Process has %zu (of %zu available) client(s) in use after notification %s has clients: %d",

          mNumConnectedServices, mRegisteredServices.size(), name.c_str(), clients);



    maybeTryShutdown();

    maybeTryShutdownLocked();

    return Status::ok();

}



 void ClientCounterCallbackImpl::tryShutdown() {

void ClientCounterCallbackImpl::tryShutdownLocked() {

    ALOGI("Trying to shut down the service. No clients in use for any service in process.");



    if (tryUnregister()) {

    if (tryUnregisterLocked()) {

        ALOGI("Unregistered all clients and exiting");

        exit(EXIT_SUCCESS);

    }



    reRegister();

    reRegisterLocked();

}



void ClientCounterCallbackImpl::setActiveServicesCallback(const std::function<bool(bool)>&

                                                          activeServicesCallback) {

    std::lock_guard<std::mutex> lock(mMutex);

    mActiveServicesCallback = activeServicesCallback;

}
@@ -291,11 +302,15 @@ void ClientCounterCallback::setActiveServicesCallback(const std::function<bool(b 
}



bool ClientCounterCallback::tryUnregister() {

    return mImpl->tryUnregister();

    // see comments in header, this should only be called from the active

    // services callback, see also b/191781736

    return mImpl->tryUnregisterLocked();

}



void ClientCounterCallback::reRegister() {

    mImpl->reRegister();

    // see comments in header, this should only be called from the active

    // services callback, see also b/191781736

    mImpl->reRegisterLocked();

}



}  // namespace internal

libs/binder/include/binder/LazyServiceRegistrar.h

+3 −2
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ class LazyServiceRegistrar { 


     /**

      * Try to unregister all services previously registered with 'registerService'.

      * Returns 'true' if successful.

      * Returns 'true' if successful. This should only be called within the callback registered by

      * setActiveServicesCallback.

      */

     bool tryUnregister();

libs/binder/libbinder.arm32.map

+0 −21
Original line number Diff line number Diff line
@@ -389,15 +389,6 @@ LIBBINDER { 
    _ZN7android6binder8internal21ClientCounterCallback25setActiveServicesCallbackERKNSt3__18functionIFbbEEE;

    _ZN7android6binder8internal21ClientCounterCallbackC1Ev;

    _ZN7android6binder8internal21ClientCounterCallbackC2Ev;

    _ZN7android6binder8internal25ClientCounterCallbackImpl10reRegisterEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl11tryShutdownEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl12forcePersistEb;

    _ZN7android6binder8internal25ClientCounterCallbackImpl13tryUnregisterEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS8_11char_traitsIcEENS8_9allocatorIcEEEEbi;

    _ZN7android6binder8internal25ClientCounterCallbackImpl16maybeTryShutdownEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl23assertRegisteredServiceERKNS_2spINS_7IBinderEEE;

    _ZN7android6binder8internal25ClientCounterCallbackImpl25setActiveServicesCallbackERKNSt3__18functionIFbbEEE;

    _ZN7android6binder8internal25ClientCounterCallbackImpl9onClientsERKNS_2spINS_7IBinderEEEb;

    _ZN7android6Parcel10appendFromEPKS0_jj;

    _ZN7android6Parcel10markForRpcERKNS_2spINS_10RpcSessionEEE;

    _ZN7android6Parcel10writeFloatEf;
@@ -1076,7 +1067,6 @@ LIBBINDER { 
    _ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_;

    _ZNKSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_;

    _ZNKSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_;

    _ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE14__count_uniqueIS7_EEjRKT_;

    _ZNSt3__111__sift_downIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeESB_;

    _ZNSt3__111unique_lockINS_5mutexEE6unlockEv;

    _ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_;
@@ -1223,9 +1213,6 @@ LIBBINDER { 
    _ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_;

    _ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE;

    _ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE;

    _ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISO_EERKT_;

    _ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEEiEEbEERKT_DpOT0_;

    _ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE;

    _ZNSt3__16vectorIaNS_9allocatorIaEEE6insertIPKaEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIaNS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIPaEEE4typeENSC_IS6_EES8_S8_;

    _ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb0ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_;

    _ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb1ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_;
@@ -1353,12 +1340,6 @@ LIBBINDER { 
    _ZTCN7android2os17BpServiceCallbackE0_NS_10IInterfaceE;

    _ZTCN7android2os17BpServiceCallbackE0_NS_11BpInterfaceINS0_16IServiceCallbackEEE;

    _ZTCN7android2os17BpServiceCallbackE4_NS_9BpRefBaseE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_10IInterfaceE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_11BnInterfaceINS_2os15IClientCallbackEEE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_2os15IClientCallbackE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_2os16BnClientCallbackE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE4_NS_7BBinderE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE4_NS_7IBinderE;

    _ZTCN7android7BBinderE0_NS_7IBinderE;

    _ZTCN7android7content2pm21IPackageManagerNativeE0_NS_10IInterfaceE;

    _ZTCN7android7content2pm22BnPackageManagerNativeE0_NS_10IInterfaceE;
@@ -1447,7 +1428,6 @@ LIBBINDER { 
    _ZTTN7android2os16IServiceCallbackE;

    _ZTTN7android2os17BnServiceCallbackE;

    _ZTTN7android2os17BpServiceCallbackE;

    _ZTTN7android6binder8internal25ClientCounterCallbackImplE;

    _ZTTN7android7BBinderE;

    _ZTTN7android7content2pm21IPackageManagerNativeE;

    _ZTTN7android7content2pm22BnPackageManagerNativeE;
@@ -1581,7 +1561,6 @@ LIBBINDER { 
    _ZTVN7android2os17BpServiceCallbackE;

    _ZTVN7android2os17PersistableBundleE;

    _ZTVN7android2os20ParcelFileDescriptorE;

    _ZTVN7android6binder8internal25ClientCounterCallbackImplE;

    _ZTVN7android6VectorIiEE;

    _ZTVN7android6VectorINS_12ProcessState12handle_entryEEE;

    _ZTVN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE;

libs/binder/libbinder.arm32.vendor.map

+0 −21
Original line number Diff line number Diff line
@@ -359,15 +359,6 @@ LIBBINDER { 
    _ZN7android6binder8internal21ClientCounterCallback25setActiveServicesCallbackERKNSt3__18functionIFbbEEE;

    _ZN7android6binder8internal21ClientCounterCallbackC1Ev;

    _ZN7android6binder8internal21ClientCounterCallbackC2Ev;

    _ZN7android6binder8internal25ClientCounterCallbackImpl10reRegisterEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl11tryShutdownEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl12forcePersistEb;

    _ZN7android6binder8internal25ClientCounterCallbackImpl13tryUnregisterEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS8_11char_traitsIcEENS8_9allocatorIcEEEEbi;

    _ZN7android6binder8internal25ClientCounterCallbackImpl16maybeTryShutdownEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl23assertRegisteredServiceERKNS_2spINS_7IBinderEEE;

    _ZN7android6binder8internal25ClientCounterCallbackImpl25setActiveServicesCallbackERKNSt3__18functionIFbbEEE;

    _ZN7android6binder8internal25ClientCounterCallbackImpl9onClientsERKNS_2spINS_7IBinderEEEb;

    _ZN7android6Parcel10appendFromEPKS0_jj;

    _ZN7android6Parcel10markForRpcERKNS_2spINS_10RpcSessionEEE;

    _ZN7android6Parcel10writeFloatEf;
@@ -1022,7 +1013,6 @@ LIBBINDER { 
    _ZNKSt3__16__treeINS_12__value_typeIN7android8String16ENS_6vectorIxNS_9allocatorIxEEEEEENS_19__map_value_compareIS3_S8_NS_4lessIS3_EELb1EEENS5_IS8_EEE4findIS3_EENS_21__tree_const_iteratorIS8_PNS_11__tree_nodeIS8_PvEEiEERKT_;

    _ZNKSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_;

    _ZNKSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_;

    _ZNKSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE14__count_uniqueIS7_EEjRKT_;

    _ZNSt3__111__sift_downIRNS_4lessIN7android8RpcState10BinderNode9AsyncTodoEEENS_11__wrap_iterIPS5_EEEEvT0_SB_T_NS_15iterator_traitsISB_E15difference_typeESB_;

    _ZNSt3__111unique_lockINS_5mutexEE6unlockEv;

    _ZNSt3__112__hash_tableINS_17__hash_value_typeIijEENS_22__unordered_map_hasherIiS2_NS_4hashIiEELb1EEENS_21__unordered_map_equalIiS2_NS_8equal_toIiEELb1EEENS_9allocatorIS2_EEE14__erase_uniqueIiEEjRKT_;
@@ -1169,9 +1159,6 @@ LIBBINDER { 
    _ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE4findIS3_EENS_15__tree_iteratorIS4_PNS_11__tree_nodeIS4_PvEEiEERKT_;

    _ZNSt3__16__treeINS_12__value_typeIN7android8String16ExEENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE;

    _ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE;

    _ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISO_EERKT_;

    _ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEEiEEbEERKT_DpOT0_;

    _ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE;

    _ZNSt3__16vectorIaNS_9allocatorIaEEE6insertIPKaEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIaNS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIPaEEE4typeENSC_IS6_EES8_S8_;

    _ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb0ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_;

    _ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb1ELj0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_;
@@ -1289,12 +1276,6 @@ LIBBINDER { 
    _ZTCN7android2os17BpServiceCallbackE0_NS_10IInterfaceE;

    _ZTCN7android2os17BpServiceCallbackE0_NS_11BpInterfaceINS0_16IServiceCallbackEEE;

    _ZTCN7android2os17BpServiceCallbackE4_NS_9BpRefBaseE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_10IInterfaceE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_11BnInterfaceINS_2os15IClientCallbackEEE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_2os15IClientCallbackE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_2os16BnClientCallbackE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE4_NS_7BBinderE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE4_NS_7IBinderE;

    _ZTCN7android7BBinderE0_NS_7IBinderE;

    _ZTCN7android7content2pm21IPackageManagerNativeE0_NS_10IInterfaceE;

    _ZTCN7android7content2pm22BnPackageManagerNativeE0_NS_10IInterfaceE;
@@ -1379,7 +1360,6 @@ LIBBINDER { 
    _ZTTN7android2os16IServiceCallbackE;

    _ZTTN7android2os17BnServiceCallbackE;

    _ZTTN7android2os17BpServiceCallbackE;

    _ZTTN7android6binder8internal25ClientCounterCallbackImplE;

    _ZTTN7android7BBinderE;

    _ZTTN7android7content2pm21IPackageManagerNativeE;

    _ZTTN7android7content2pm22BnPackageManagerNativeE;
@@ -1506,7 +1486,6 @@ LIBBINDER { 
    _ZTVN7android2os17BpServiceCallbackE;

    _ZTVN7android2os17PersistableBundleE;

    _ZTVN7android2os20ParcelFileDescriptorE;

    _ZTVN7android6binder8internal25ClientCounterCallbackImplE;

    _ZTVN7android6VectorIiEE;

    _ZTVN7android6VectorINS_12ProcessState12handle_entryEEE;

    _ZTVN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE;

libs/binder/libbinder.arm64.map

+0 −20
Original line number Diff line number Diff line
@@ -390,15 +390,6 @@ LIBBINDER { 
    _ZN7android6binder8internal21ClientCounterCallback25setActiveServicesCallbackERKNSt3__18functionIFbbEEE;

    _ZN7android6binder8internal21ClientCounterCallbackC1Ev;

    _ZN7android6binder8internal21ClientCounterCallbackC2Ev;

    _ZN7android6binder8internal25ClientCounterCallbackImpl10reRegisterEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl11tryShutdownEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl12forcePersistEb;

    _ZN7android6binder8internal25ClientCounterCallbackImpl13tryUnregisterEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS8_11char_traitsIcEENS8_9allocatorIcEEEEbi;

    _ZN7android6binder8internal25ClientCounterCallbackImpl16maybeTryShutdownEv;

    _ZN7android6binder8internal25ClientCounterCallbackImpl23assertRegisteredServiceERKNS_2spINS_7IBinderEEE;

    _ZN7android6binder8internal25ClientCounterCallbackImpl25setActiveServicesCallbackERKNSt3__18functionIFbbEEE;

    _ZN7android6binder8internal25ClientCounterCallbackImpl9onClientsERKNS_2spINS_7IBinderEEEb;

    _ZN7android6Parcel10appendFromEPKS0_mm;

    _ZN7android6Parcel10markForRpcERKNS_2spINS_10RpcSessionEEE;

    _ZN7android6Parcel10writeFloatEf;
@@ -1213,9 +1204,6 @@ LIBBINDER { 
    _ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE5eraseENS_21__tree_const_iteratorIS4_PNS_11__tree_nodeIS4_PvEElEE;

    _ZNSt3__16__treeINS_12__value_typeIN7android8String16ES3_EENS_19__map_value_compareIS3_S4_NS_4lessIS3_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE;

    _ZNSt3__16__treeINS_12__value_typeINS_11__thread_idENS_6threadEEENS_19__map_value_compareIS2_S4_NS_4lessIS2_EELb1EEENS_9allocatorIS4_EEE7destroyEPNS_11__tree_nodeIS4_PvEE;

    _ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE12__find_equalIS7_EERPNS_16__tree_node_baseIPvEERPNS_15__tree_end_nodeISO_EERKT_;

    _ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE25__emplace_unique_key_argsIS7_JRKNS_21piecewise_construct_tENS_5tupleIJRKS7_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISD_PNS_11__tree_nodeISD_PvEElEEbEERKT_DpOT0_;

    _ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEN7android6binder8internal25ClientCounterCallbackImpl7ServiceEEENS_19__map_value_compareIS7_SD_NS_4lessIS7_EELb1EEENS5_ISD_EEE7destroyEPNS_11__tree_nodeISD_PvEE;

    _ZNSt3__16vectorIaNS_9allocatorIaEEE6insertIPKaEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIaNS_15iterator_traitsIS8_E9referenceEEE5valueENS_11__wrap_iterIPaEEE4typeENSC_IS6_EES8_S8_;

    _ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb0ELm0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_;

    _ZNSt3__16vectorIbNS_9allocatorIbEEE18__construct_at_endINS_14__bit_iteratorIS3_Lb1ELm0EEEEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeES8_S8_;
@@ -1339,12 +1327,6 @@ LIBBINDER { 
    _ZTCN7android2os17BpServiceCallbackE0_NS_10IInterfaceE;

    _ZTCN7android2os17BpServiceCallbackE0_NS_11BpInterfaceINS0_16IServiceCallbackEEE;

    _ZTCN7android2os17BpServiceCallbackE8_NS_9BpRefBaseE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_10IInterfaceE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_11BnInterfaceINS_2os15IClientCallbackEEE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_2os15IClientCallbackE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE0_NS_2os16BnClientCallbackE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE8_NS_7BBinderE;

    _ZTCN7android6binder8internal25ClientCounterCallbackImplE8_NS_7IBinderE;

    _ZTCN7android7BBinderE0_NS_7IBinderE;

    _ZTCN7android7content2pm21IPackageManagerNativeE0_NS_10IInterfaceE;

    _ZTCN7android7content2pm22BnPackageManagerNativeE0_NS_10IInterfaceE;
@@ -1433,7 +1415,6 @@ LIBBINDER { 
    _ZTTN7android2os16IServiceCallbackE;

    _ZTTN7android2os17BnServiceCallbackE;

    _ZTTN7android2os17BpServiceCallbackE;

    _ZTTN7android6binder8internal25ClientCounterCallbackImplE;

    _ZTTN7android7BBinderE;

    _ZTTN7android7content2pm21IPackageManagerNativeE;

    _ZTTN7android7content2pm22BnPackageManagerNativeE;
@@ -1565,7 +1546,6 @@ LIBBINDER { 
    _ZTVN7android2os17BpServiceCallbackE;

    _ZTVN7android2os17PersistableBundleE;

    _ZTVN7android2os20ParcelFileDescriptorE;

    _ZTVN7android6binder8internal25ClientCounterCallbackImplE;

    _ZTVN7android6VectorIiEE;

    _ZTVN7android6VectorINS_12ProcessState12handle_entryEEE;

    _ZTVN7android6VectorINS_2spINS_18BufferedTextOutput11BufferStateEEEEE;