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

Commit b8c002f0 authored by Guojing Yuan's avatar Guojing Yuan Committed by Android (Google) Code Review
Browse files

Merge "[CDM] Setup trunk stable flagging" into main

parents 9b1cf8ce eecbf216

AconfigFlags.bp

+15 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


aconfig_srcjars = [

    ":android.app.usage.flags-aconfig-java{.generated_srcjars}",

    ":android.companion.flags-aconfig-java{.generated_srcjars}",

    ":android.content.pm.flags-aconfig-java{.generated_srcjars}",

    ":android.hardware.radio.flags-aconfig-java{.generated_srcjars}",

    ":android.nfc.flags-aconfig-java{.generated_srcjars}",
@@ -448,7 +449,7 @@ aconfig_declarations { 
    package: "android.service.autofill",

    srcs: [

        "services/autofill/bugfixes.aconfig",

        "services/autofill/features.aconfig"

        "services/autofill/features.aconfig",

    ],

}
@@ -457,3 +458,16 @@ java_aconfig_library { 
    aconfig_declarations: "android.service.autofill.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Companion

aconfig_declarations {

    name: "android.companion.flags-aconfig",

    package: "android.companion",

    srcs: ["core/java/android/companion/*.aconfig"],

}



java_aconfig_library {

    name: "android.companion.flags-aconfig-java",

    aconfig_declarations: "android.companion.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ package android.appwidget { 


package android.companion {



  public static final class AssociationInfo.Builder {

  @FlaggedApi("android.companion.new_association_builder") public static final class AssociationInfo.Builder {

    ctor public AssociationInfo.Builder(int, int, @NonNull String);

    ctor public AssociationInfo.Builder(@NonNull android.companion.AssociationInfo);

    method @NonNull public android.companion.AssociationInfo build();

core/java/android/companion/AssociationInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package android.companion;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;
@@ -412,6 +413,7 @@ public final class AssociationInfo implements Parcelable { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_NEW_ASSOCIATION_BUILDER)

    @TestApi

    public static final class Builder {

        private final int mId;

core/java/android/companion/flags.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "android.companion"



flag {

    name: "new_association_builder"

    namespace: "companion"

    description: "Controls if the new Builder is exposed to test apis."

    bug: "296251481"

}
 
 No newline at end of file