diff --git a/startup/init/syscap/include/deviceinfo.h b/startup/init/syscap/include/deviceinfo.h index f1c9e15770431d8a909c3612e106421f2e54f481..05f1bbd2bcb97ce48d5a7cc0989c6ba612528643 100644 --- a/startup/init/syscap/include/deviceinfo.h +++ b/startup/init/syscap/include/deviceinfo.h @@ -157,24 +157,6 @@ const char *OH_GetOSFullName(void); */ int OH_GetSdkApiVersion(void); -/** - * Obtains the sdk minor api version number. - * @syscap SystemCapability.Startup.SystemInfo - * @return 0 ~ 999 - the sdk minor api version - * -1 - not found the sdk minor api version number, or failed to invoke the internal interface. - * @since 20 - */ -int OH_GetSdkMinorApiVersion(void); - -/** - * Obtains the sdk patch api version number. - * @syscap SystemCapability.Startup.SystemInfo - * @return 0 ~ 999 - the sdk patch api version - * -1 - not found the sdk patch api version number, or failed to invoke the internal interface. - * @since 20 - */ -int OH_GetSdkPatchApiVersion(void); - /** * Obtains the first API version number. * @syscap SystemCapability.Startup.SystemInfo diff --git a/startup/init/syscap/include/syscap_ndk.h b/startup/init/syscap/include/syscap_ndk.h index e6045e8553f3d2b0dc81e811cb00816b404b37b4..a52f30603aa88f8ca59b64303c3e7c1d81b344dc 100644 --- a/startup/init/syscap/include/syscap_ndk.h +++ b/startup/init/syscap/include/syscap_ndk.h @@ -44,24 +44,6 @@ extern "C" { bool canIUse(const char *cap); -/** - * @brief determine whether the current operating system version is greater than or equal to the given value. - * - * @param majorVersion The major version number which betwen 1 and 999, such as 20 in api version 20.1.2 - * @param minorVersion The minor version number which betwen 0 and 999, such as 1 in api version 20.1.2 - * @param patchVersion The patch version number which betwen 0 and 999, such as 2 in api version 20.1.2 - * @return true - operating system version is greater than or equal to the given value - * false - operating system version is less than the given value or invalid api version - * @since 20 - * @example given version is "20.1" - * if (OH_IsApiVersionGreaterOrEqual(20, 1, 0)) { - * // Use 20.1 APIs. - * } else { - * // Alternative code for earlier versions. - * } - */ -bool OH_IsApiVersionGreaterOrEqual(int majorVersion, int minorVersion, int patchVersion); - #ifdef __cplusplus #if __cplusplus } diff --git a/startup/init/syscap/libdeviceinfo.ndk.json b/startup/init/syscap/libdeviceinfo.ndk.json index 60684fed048f46b88513ef3bf3bf8fca68a5de4c..dfed9279629410bcd503cf146c361860ba288421 100644 --- a/startup/init/syscap/libdeviceinfo.ndk.json +++ b/startup/init/syscap/libdeviceinfo.ndk.json @@ -1,9 +1,5 @@ [ {"name": "canIUse"}, - { - "first_introduced": "19", - "name": "OH_IsApiVersionGreaterOrEqual" - }, {"name": "OH_GetDeviceType"}, {"name": "OH_GetManufacture"}, {"name": "OH_GetBrand"}, @@ -20,14 +16,6 @@ {"name": "OH_GetOsReleaseType"}, {"name": "OH_GetOSFullName"}, {"name": "OH_GetSdkApiVersion"}, - { - "first_introduced": "19", - "name": "OH_GetSdkMinorApiVersion" - }, - { - "first_introduced": "19", - "name": "OH_GetSdkPatchApiVersion" - }, {"name": "OH_GetFirstApiVersion"}, {"name": "OH_GetVersionId"}, {"name": "OH_GetBuildType"},