diff options
| author | 2024-07-02 17:33:00 +0000 | |
|---|---|---|
| committer | 2024-07-02 17:33:00 +0000 | |
| commit | b54a7bb972923534ba2c5a205cd8d36bd562cfb3 (patch) | |
| tree | 38445b0efe313fdc52139c8586d2d5fc8cef6d61 /api/coverage/tools | |
| parent | 1ec84bc274b677278ed1dbb2c1707faa2b813a53 (diff) | |
| parent | 48f21ec98708f2641a1a6c2d4998fe9992aeccca (diff) | |
Merge "Simplify handling of nested classes" into main am: b983c5bc5f am: 48f21ec987
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3155546
Change-Id: Idb09d7faa250af7d0b56cd05347345917aee6e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/coverage/tools')
| -rw-r--r-- | api/coverage/tools/ExtractFlaggedApis.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/coverage/tools/ExtractFlaggedApis.kt b/api/coverage/tools/ExtractFlaggedApis.kt index 5efda98a1518..bf67187f4bad 100644 --- a/api/coverage/tools/ExtractFlaggedApis.kt +++ b/api/coverage/tools/ExtractFlaggedApis.kt @@ -75,10 +75,10 @@ fun addFlaggedApi(builder: FlagApiMap.Builder, api: JavaMethod.Builder, flag: St fun getClassFlag(classItem: ClassItem): String? { var classFlag = getFlagAnnotation(classItem) var cur = classItem - // If a class is not an inner class, use its @FlaggedApi annotation value. + // If a class is not a nested class, use its @FlaggedApi annotation value. // Otherwise, use the flag value of the closest outer class that is annotated by @FlaggedApi. - while (cur.isInnerClass() && classFlag == null) { - cur = cur.parent() as ClassItem + while (classFlag == null) { + cur = cur.containingClass() ?: break classFlag = getFlagAnnotation(cur) } return classFlag |