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

Commit 31df911b 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: 09bd57d0 

Original change: https://android-review.googlesource.com/c/platform/build/+/3176259



Change-Id: Ibbfa5000bed6786e71ac4d47bfda146b20064434
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 235076ff 09bd57d0

tools/check-flagged-apis/src/com/android/checkflaggedapis/Main.kt

+7 −7
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package com.android.checkflaggedapis 


import android.aconfig.Aconfig

import com.android.tools.metalava.model.BaseItemVisitor

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

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

import com.android.tools.metalava.model.FieldItem

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

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

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

import com.github.ajalt.clikt.core.CliktCommand

import com.github.ajalt.clikt.core.ProgramResult
@@ -274,15 +274,15 @@ internal fun parseApiSignature(path: String, input: InputStream): Set<Pair<Symbo 
          }

        }



        override fun visitMethod(method: MethodItem) {

          getFlagOrNull(method)?.let { flag ->

            val methodName = buildString {

              append(method.name())

        override fun visitCallable(callable: CallableItem) {

          getFlagOrNull(callable)?.let { flag ->

            val callableSignature = buildString {

              append(callable.name())

              append("(")

              method.parameters().joinTo(this, separator = "") { it.type().internalName() }

              callable.parameters().joinTo(this, separator = "") { it.type().internalName() }

              append(")")

            }

            val symbol = Symbol.createMethod(method.containingClass().qualifiedName(), methodName)

            val symbol = Symbol.createMethod(callable.containingClass().qualifiedName(), callableSignature)

            output.add(Pair(symbol, flag))

          }

        }