diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-18 03:12:51 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-18 03:12:51 +0000 |
| commit | debfb2ca1e74b9a02611bce1045effdc649b04a1 (patch) | |
| tree | 065a272a2fa507d0d6982c7094a5df478a2d7588 /libprocessgroup/cgrouprc | |
| parent | 52534ebba1087f57169e067be9676388893acc73 (diff) | |
| parent | 320211cbba531983d3646085adc1da11f4d15fae (diff) | |
Snap for 5667727 from 320211cbba531983d3646085adc1da11f4d15fae to qt-qpr1-release
Change-Id: I4648df6648df8652fa2700532494700229583da7
Diffstat (limited to 'libprocessgroup/cgrouprc')
| -rw-r--r-- | libprocessgroup/cgrouprc/cgroup_controller.cpp | 5 | ||||
| -rw-r--r-- | libprocessgroup/cgrouprc/include/android/cgrouprc.h | 9 | ||||
| -rw-r--r-- | libprocessgroup/cgrouprc/libcgrouprc.llndk.txt | 1 |
3 files changed, 1 insertions, 14 deletions
diff --git a/libprocessgroup/cgrouprc/cgroup_controller.cpp b/libprocessgroup/cgrouprc/cgroup_controller.cpp index 5a326e55d..d064d312e 100644 --- a/libprocessgroup/cgrouprc/cgroup_controller.cpp +++ b/libprocessgroup/cgrouprc/cgroup_controller.cpp @@ -27,11 +27,6 @@ uint32_t ACgroupController_getVersion(const ACgroupController* controller) { return controller->version(); } -uint32_t ACgroupController_getFlags(const ACgroupController* controller) { - CHECK(controller != nullptr); - return controller->flags(); -} - const char* ACgroupController_getName(const ACgroupController* controller) { CHECK(controller != nullptr); return controller->name(); diff --git a/libprocessgroup/cgrouprc/include/android/cgrouprc.h b/libprocessgroup/cgrouprc/include/android/cgrouprc.h index ffc9f0b60..0f6a9cd5d 100644 --- a/libprocessgroup/cgrouprc/include/android/cgrouprc.h +++ b/libprocessgroup/cgrouprc/include/android/cgrouprc.h @@ -66,18 +66,11 @@ __attribute__((warn_unused_result)) uint32_t ACgroupController_getVersion(const __INTRODUCED_IN(29); /** - * Flag bitmask used in ACgroupController_getFlags + * Flag bitmask to be used when ACgroupController_getFlags can be exported */ #define CGROUPRC_CONTROLLER_FLAG_MOUNTED 0x1 /** - * Returns the flags bitmask of the given controller. - * If the given controller is null, return 0. - */ -__attribute__((warn_unused_result)) uint32_t ACgroupController_getFlags(const ACgroupController*) - __INTRODUCED_IN(29); - -/** * Returns the name of the given controller. * If the given controller is null, return nullptr. */ diff --git a/libprocessgroup/cgrouprc/libcgrouprc.llndk.txt b/libprocessgroup/cgrouprc/libcgrouprc.llndk.txt index ea3df33e6..91df3929d 100644 --- a/libprocessgroup/cgrouprc/libcgrouprc.llndk.txt +++ b/libprocessgroup/cgrouprc/libcgrouprc.llndk.txt @@ -4,7 +4,6 @@ LIBCGROUPRC { # introduced=29 ACgroupFile_getControllerCount; ACgroupFile_getController; ACgroupController_getVersion; - ACgroupController_getFlags; ACgroupController_getName; ACgroupController_getPath; local: |