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

Commit 5a136f7b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace AnnotationAttribute.legacyValue with value" into main

parents aaa9fb44 72b13a9c

api/coverage/tools/ExtractFlaggedApis.kt

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import com.android.tools.metalava.model.CallableItem 
import com.android.tools.metalava.model.ClassItem

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

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

import com.android.tools.metalava.model.value.asString

import java.io.File

import java.io.FileWriter
@@ -88,6 +89,6 @@ fun getFlagAnnotation(item: Item): String? { 
    return item.modifiers

        .findAnnotation("android.annotation.FlaggedApi")

        ?.findAttribute("value")

        ?.legacyValue

        ?.value() as? String

        ?.value

        ?.asString()

}

api/coverage/tools/ExtractFlaggedApisTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ class ExtractFlaggedApisTest { 
            """

            // Signature format: 2.0

            package android.location.provider {

              @FlaggedApi(Flags.FLAG_NEW_GEOCODER) public final class ForwardGeocodeRequest implements android.os.Parcelable {

              @FlaggedApi("android.location.flags.new_geocoder") public final class ForwardGeocodeRequest implements android.os.Parcelable {

                method public int describeContents();

              }

              public static final class ForwardGeocodeRequest.Builder {
@@ -170,13 +170,13 @@ class ExtractFlaggedApisTest { 
                .setPackageName("android.location.provider")

                .setClassName("ForwardGeocodeRequest")

                .setMethodName("describeContents")

        addFlaggedApi(expected, api1, "Flags.FLAG_NEW_GEOCODER")

        addFlaggedApi(expected, api1, "android.location.flags.new_geocoder")

        val api2 =

            JavaMethod.newBuilder()

                .setPackageName("android.location.provider")

                .setClassName("ForwardGeocodeRequest.Builder")

                .setMethodName("build")

        addFlaggedApi(expected, api2, "Flags.FLAG_NEW_GEOCODER")

        addFlaggedApi(expected, api2, "android.location.flags.new_geocoder")

        assertThat(result).ignoringRepeatedFieldOrder().isEqualTo(expected.build())

    }
@@ -186,7 +186,7 @@ class ExtractFlaggedApisTest { 
            """

            // Signature format: 2.0

            package android.package.xyz {

              @FlaggedApi(outer_class_flag) public final class OuterClass {

              @FlaggedApi("outer_class_flag") public final class OuterClass {

                method public int apiInOuterClass();

              }

              public final class OuterClass.Deeply.NestedClass {