APIs for lazy services shutdown customization. am: dcd0275ffc

Original change: https://android-review.googlesource.com/c/platform/prebuilts/abi-dumps/ndk/+/1570978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4477a5bd7b634258b40cc41dc516f6cd291357a

6 files changed, 468 insertions, 0 deletions

diff --git a/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump b/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
index 3970100..8e5622e 100644
--- a/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -449,15 +449,27 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forceLazyServicesPersist"
+  },
+  {
    "name" : "AServiceManager_getService"
   },
   {
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_reRegister"
+  },
+  {
    "name" : "AServiceManager_registerLazyService"
   },
   {
+   "name" : "AServiceManager_setActiveServicesCallback"
+  },
+  {
+   "name" : "AServiceManager_tryUnregister"
+  },
+  {
    "name" : "AServiceManager_waitForService"
   },
   {
@@ -2362,6 +2374,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFbbPvE",
+   "name" : "bool (bool, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFbbPvE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbbPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
    "parameters" :
@@ -7644,6 +7674,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forceLazyServicesPersist",
+   "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_getService",
    "linker_set_key" : "AServiceManager_getService",
    "parameters" :
@@ -7668,6 +7710,12 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_reRegister",
+   "linker_set_key" : "AServiceManager_reRegister",
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_registerLazyService",
    "linker_set_key" : "AServiceManager_registerLazyService",
    "parameters" :
@@ -7683,6 +7731,27 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_setActiveServicesCallback",
+   "linker_set_key" : "AServiceManager_setActiveServicesCallback",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFbbPvE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "function_name" : "AServiceManager_tryUnregister",
+   "linker_set_key" : "AServiceManager_tryUnregister",
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_waitForService",
    "linker_set_key" : "AServiceManager_waitForService",
    "parameters" :
@@ -8813,6 +8882,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPFbbPvE",
+   "name" : "bool (*)(bool, void *)",
+   "referenced_type" : "_ZTIFbbPvE",
+   "self_type" : "_ZTIPFbbPvE",
+   "size" : 8,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
    "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
diff --git a/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump b/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
index 66b00b5..aa9f67f 100644
--- a/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
@@ -449,15 +449,27 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forceLazyServicesPersist"
+  },
+  {
    "name" : "AServiceManager_getService"
   },
   {
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_reRegister"
+  },
+  {
    "name" : "AServiceManager_registerLazyService"
   },
   {
+   "name" : "AServiceManager_setActiveServicesCallback"
+  },
+  {
+   "name" : "AServiceManager_tryUnregister"
+  },
+  {
    "name" : "AServiceManager_waitForService"
   },
   {
@@ -2362,6 +2374,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFbbPvE",
+   "name" : "bool (bool, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFbbPvE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbbPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
    "parameters" :
@@ -7644,6 +7674,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forceLazyServicesPersist",
+   "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_getService",
    "linker_set_key" : "AServiceManager_getService",
    "parameters" :
@@ -7668,6 +7710,12 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_reRegister",
+   "linker_set_key" : "AServiceManager_reRegister",
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_registerLazyService",
    "linker_set_key" : "AServiceManager_registerLazyService",
    "parameters" :
@@ -7683,6 +7731,27 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_setActiveServicesCallback",
+   "linker_set_key" : "AServiceManager_setActiveServicesCallback",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFbbPvE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "function_name" : "AServiceManager_tryUnregister",
+   "linker_set_key" : "AServiceManager_tryUnregister",
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_waitForService",
    "linker_set_key" : "AServiceManager_waitForService",
    "parameters" :
@@ -8813,6 +8882,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFbbPvE",
+   "name" : "bool (*)(bool, void *)",
+   "referenced_type" : "_ZTIFbbPvE",
+   "self_type" : "_ZTIPFbbPvE",
+   "size" : 4,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
    "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
diff --git a/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump b/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
index 66b00b5..aa9f67f 100644
--- a/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -449,15 +449,27 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forceLazyServicesPersist"
+  },
+  {
    "name" : "AServiceManager_getService"
   },
   {
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_reRegister"
+  },
+  {
    "name" : "AServiceManager_registerLazyService"
   },
   {
+   "name" : "AServiceManager_setActiveServicesCallback"
+  },
+  {
+   "name" : "AServiceManager_tryUnregister"
+  },
+  {
    "name" : "AServiceManager_waitForService"
   },
   {
@@ -2362,6 +2374,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFbbPvE",
+   "name" : "bool (bool, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFbbPvE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbbPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
    "parameters" :
@@ -7644,6 +7674,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forceLazyServicesPersist",
+   "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_getService",
    "linker_set_key" : "AServiceManager_getService",
    "parameters" :
@@ -7668,6 +7710,12 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_reRegister",
+   "linker_set_key" : "AServiceManager_reRegister",
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_registerLazyService",
    "linker_set_key" : "AServiceManager_registerLazyService",
    "parameters" :
@@ -7683,6 +7731,27 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_setActiveServicesCallback",
+   "linker_set_key" : "AServiceManager_setActiveServicesCallback",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFbbPvE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "function_name" : "AServiceManager_tryUnregister",
+   "linker_set_key" : "AServiceManager_tryUnregister",
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_waitForService",
    "linker_set_key" : "AServiceManager_waitForService",
    "parameters" :
@@ -8813,6 +8882,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFbbPvE",
+   "name" : "bool (*)(bool, void *)",
+   "referenced_type" : "_ZTIFbbPvE",
+   "self_type" : "_ZTIPFbbPvE",
+   "size" : 4,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
    "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
diff --git a/S/64/x86/source-based/libbinder_ndk.so.lsdump b/S/64/x86/source-based/libbinder_ndk.so.lsdump
index 0315631..41c9c78 100644
--- a/S/64/x86/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/x86/source-based/libbinder_ndk.so.lsdump
@@ -448,15 +448,27 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forceLazyServicesPersist"
+  },
+  {
    "name" : "AServiceManager_getService"
   },
   {
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_reRegister"
+  },
+  {
    "name" : "AServiceManager_registerLazyService"
   },
   {
+   "name" : "AServiceManager_setActiveServicesCallback"
+  },
+  {
+   "name" : "AServiceManager_tryUnregister"
+  },
+  {
    "name" : "AServiceManager_waitForService"
   },
   {
@@ -2361,6 +2373,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFbbPvE",
+   "name" : "bool (bool, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFbbPvE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbbPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
    "parameters" :
@@ -7643,6 +7673,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forceLazyServicesPersist",
+   "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_getService",
    "linker_set_key" : "AServiceManager_getService",
    "parameters" :
@@ -7667,6 +7709,12 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_reRegister",
+   "linker_set_key" : "AServiceManager_reRegister",
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_registerLazyService",
    "linker_set_key" : "AServiceManager_registerLazyService",
    "parameters" :
@@ -7682,6 +7730,27 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_setActiveServicesCallback",
+   "linker_set_key" : "AServiceManager_setActiveServicesCallback",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFbbPvE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "function_name" : "AServiceManager_tryUnregister",
+   "linker_set_key" : "AServiceManager_tryUnregister",
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_waitForService",
    "linker_set_key" : "AServiceManager_waitForService",
    "parameters" :
@@ -8812,6 +8881,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFbbPvE",
+   "name" : "bool (*)(bool, void *)",
+   "referenced_type" : "_ZTIFbbPvE",
+   "self_type" : "_ZTIPFbbPvE",
+   "size" : 4,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
    "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
diff --git a/S/64/x86_64/source-based/libbinder_ndk.so.lsdump b/S/64/x86_64/source-based/libbinder_ndk.so.lsdump
index 730c6f7..ba67348 100644
--- a/S/64/x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/x86_64/source-based/libbinder_ndk.so.lsdump
@@ -448,15 +448,27 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forceLazyServicesPersist"
+  },
+  {
    "name" : "AServiceManager_getService"
   },
   {
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_reRegister"
+  },
+  {
    "name" : "AServiceManager_registerLazyService"
   },
   {
+   "name" : "AServiceManager_setActiveServicesCallback"
+  },
+  {
+   "name" : "AServiceManager_tryUnregister"
+  },
+  {
    "name" : "AServiceManager_waitForService"
   },
   {
@@ -2361,6 +2373,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFbbPvE",
+   "name" : "bool (bool, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFbbPvE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbbPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "double (_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
    "parameters" :
@@ -7643,6 +7673,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forceLazyServicesPersist",
+   "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_getService",
    "linker_set_key" : "AServiceManager_getService",
    "parameters" :
@@ -7667,6 +7709,12 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_reRegister",
+   "linker_set_key" : "AServiceManager_reRegister",
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_registerLazyService",
    "linker_set_key" : "AServiceManager_registerLazyService",
    "parameters" :
@@ -7682,6 +7730,27 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_setActiveServicesCallback",
+   "linker_set_key" : "AServiceManager_setActiveServicesCallback",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFbbPvE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "function_name" : "AServiceManager_tryUnregister",
+   "linker_set_key" : "AServiceManager_tryUnregister",
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_waitForService",
    "linker_set_key" : "AServiceManager_waitForService",
    "parameters" :
@@ -8821,6 +8890,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPFbbPvE",
+   "name" : "bool (*)(bool, void *)",
+   "referenced_type" : "_ZTIFbbPvE",
+   "self_type" : "_ZTIPFbbPvE",
+   "size" : 8,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
    "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
diff --git a/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump b/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
index 0315631..41c9c78 100644
--- a/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
@@ -448,15 +448,27 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forceLazyServicesPersist"
+  },
+  {
    "name" : "AServiceManager_getService"
   },
   {
    "name" : "AServiceManager_isDeclared"
   },
   {
+   "name" : "AServiceManager_reRegister"
+  },
+  {
    "name" : "AServiceManager_registerLazyService"
   },
   {
+   "name" : "AServiceManager_setActiveServicesCallback"
+  },
+  {
+   "name" : "AServiceManager_tryUnregister"
+  },
+  {
    "name" : "AServiceManager_waitForService"
   },
   {
@@ -2361,6 +2373,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFbbPvE",
+   "name" : "bool (bool, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFbbPvE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbbPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
    "parameters" :
@@ -7643,6 +7673,18 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forceLazyServicesPersist",
+   "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIb"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_getService",
    "linker_set_key" : "AServiceManager_getService",
    "parameters" :
@@ -7667,6 +7709,12 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_reRegister",
+   "linker_set_key" : "AServiceManager_reRegister",
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_registerLazyService",
    "linker_set_key" : "AServiceManager_registerLazyService",
    "parameters" :
@@ -7682,6 +7730,27 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_setActiveServicesCallback",
+   "linker_set_key" : "AServiceManager_setActiveServicesCallback",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPFbbPvE"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "function_name" : "AServiceManager_tryUnregister",
+   "linker_set_key" : "AServiceManager_tryUnregister",
+   "return_type" : "_ZTIb",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_waitForService",
    "linker_set_key" : "AServiceManager_waitForService",
    "parameters" :
@@ -8812,6 +8881,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFbbPvE",
+   "name" : "bool (*)(bool, void *)",
+   "referenced_type" : "_ZTIFbbPvE",
+   "self_type" : "_ZTIPFbbPvE",
+   "size" : 4,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
    "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",