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

Commit c6d07cbf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use CallableItem in place of MethodItem" into main am: 94c9498b am: a6db7346 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3174999



Change-Id: I02f60f4e187b5232a5b9b838b06d5eaba166a5b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 23887b40 a6db7346

api/coverage/tools/ExtractFlaggedApis.kt

+9 −9
Original line number Original line Diff line number Diff line
@@ -16,9 +16,9 @@ 




package android.platform.coverage

package android.platform.coverage





import com.android.tools.metalava.model.CallableItem

import com.android.tools.metalava.model.ClassItem

import com.android.tools.metalava.model.ClassItem

import com.android.tools.metalava.model.Item

import com.android.tools.metalava.model.Item

import com.android.tools.metalava.model.MethodItem

import com.android.tools.metalava.model.text.ApiFile

import com.android.tools.metalava.model.text.ApiFile

import java.io.File

import java.io.File

import java.io.FileWriter

import java.io.FileWriter
@@ -40,24 +40,24 @@ fun main(args: Array<String>) { 




fun extractFlaggedApisFromClass(

fun extractFlaggedApisFromClass(

    classItem: ClassItem,

    classItem: ClassItem,

    methods: List<MethodItem>,

    callables: List<CallableItem>,

    packageName: String,

    packageName: String,

    builder: FlagApiMap.Builder

    builder: FlagApiMap.Builder

) {

) {

    if (methods.isEmpty()) return

    if (callables.isEmpty()) return

    val classFlag = getClassFlag(classItem)

    val classFlag = getClassFlag(classItem)

    for (method in methods) {

    for (callable in callables) {

        val methodFlag = getFlagAnnotation(method) ?: classFlag

        val callableFlag = getFlagAnnotation(callable) ?: classFlag

        val api =

        val api =

            JavaMethod.newBuilder()

            JavaMethod.newBuilder()

                .setPackageName(packageName)

                .setPackageName(packageName)

                .setClassName(classItem.fullName())

                .setClassName(classItem.fullName())

                .setMethodName(method.name())

                .setMethodName(callable.name())

        for (param in method.parameters()) {

        for (param in callable.parameters()) {

            api.addParameters(param.type().toTypeString())

            api.addParameters(param.type().toTypeString())

        }

        }

        if (methodFlag != null) {

        if (callableFlag != null) {

            addFlaggedApi(builder, api, methodFlag)

            addFlaggedApi(builder, api, callableFlag)

        }

        }

    }

    }

}

}