Merge "Expand @FlaggedApi(FLAG) constants in API signature files" into main (7b4ab317) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+12 −5

Original line number	Original line	Diff line number	Diff line
	@@ -12,11 +12,8 @@
	// See the License for the specific language governing permissions and		// See the License for the specific language governing permissions and
	// limitations under the License.		// limitations under the License.

	// Aconfig declarations and libraries for the core framework		filegroup {
	java_defaults {		name: "framework-minus-apex-aconfig-srcjars",
	name: "framework-minus-apex-aconfig-libraries",

	// Add java_aconfig_libraries to here to add them to the core framework
	srcs: [		srcs: [
	":android.app.usage.flags-aconfig-java{.generated_srcjars}",		":android.app.usage.flags-aconfig-java{.generated_srcjars}",
	":android.content.pm.flags-aconfig-java{.generated_srcjars}",		":android.content.pm.flags-aconfig-java{.generated_srcjars}",
	@@ -36,6 +33,16 @@ java_defaults {
	":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",		":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",
	":sdk_sandbox_flags_lib{.generated_srcjars}",		":sdk_sandbox_flags_lib{.generated_srcjars}",
	],		],
			}

			// Aconfig declarations and libraries for the core framework
			java_defaults {
			name: "framework-minus-apex-aconfig-libraries",

			// Add java_aconfig_libraries to here to add them to the core framework
			srcs: [
			":framework-minus-apex-aconfig-srcjars",
			],
	// Add aconfig-annotations-lib as a dependency for the optimization		// Add aconfig-annotations-lib as a dependency for the optimization
	libs: ["aconfig-annotations-lib"],		libs: ["aconfig-annotations-lib"],
	}		}

api/StubLibraries.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,9 @@ droidstubs {
	"android-non-updatable-stubs-defaults",		"android-non-updatable-stubs-defaults",
	"module-classpath-stubs-defaults",		"module-classpath-stubs-defaults",
	],		],
			srcs: [
			":framework-minus-apex-aconfig-srcjars",
			],
	args: metalava_framework_docs_args + "--error UnflaggedApi ",		args: metalava_framework_docs_args + "--error UnflaggedApi ",
	check_api: {		check_api: {
	current: {		current: {

core/api/current.txt

+47 −47

Original line number	Original line	Diff line number	Diff line
	@@ -9681,22 +9681,22 @@ package android.companion.virtual {
	public final class VirtualDevice implements android.os.Parcelable {		public final class VirtualDevice implements android.os.Parcelable {
	method public int describeContents();		method public int describeContents();
	method public int getDeviceId();		method public int getDeviceId();
	method @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS) @NonNull public int[] getDisplayIds();		method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") @NonNull public int[] getDisplayIds();
	method @Nullable public String getName();		method @Nullable public String getName();
	method @Nullable public String getPersistentDeviceId();		method @Nullable public String getPersistentDeviceId();
	method @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS) public boolean hasCustomSensorSupport();		method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public boolean hasCustomSensorSupport();
	method public void writeToParcel(@NonNull android.os.Parcel, int);		method public void writeToParcel(@NonNull android.os.Parcel, int);
	field @NonNull public static final android.os.Parcelable.Creator<android.companion.virtual.VirtualDevice> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.companion.virtual.VirtualDevice> CREATOR;
	}		}

	public final class VirtualDeviceManager {		public final class VirtualDeviceManager {
	method @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS) @Nullable public android.companion.virtual.VirtualDevice getVirtualDevice(int);		method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") @Nullable public android.companion.virtual.VirtualDevice getVirtualDevice(int);
	method @NonNull public java.util.List<android.companion.virtual.VirtualDevice> getVirtualDevices();		method @NonNull public java.util.List<android.companion.virtual.VirtualDevice> getVirtualDevices();
	method @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS) public void registerVirtualDeviceListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.VirtualDeviceListener);		method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public void registerVirtualDeviceListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.VirtualDeviceListener);
	method @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS) public void unregisterVirtualDeviceListener(@NonNull android.companion.virtual.VirtualDeviceManager.VirtualDeviceListener);		method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public void unregisterVirtualDeviceListener(@NonNull android.companion.virtual.VirtualDeviceManager.VirtualDeviceListener);
	}		}

	@FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS) public static interface VirtualDeviceManager.VirtualDeviceListener {		@FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public static interface VirtualDeviceManager.VirtualDeviceListener {
	method public default void onVirtualDeviceClosed(int);		method public default void onVirtualDeviceClosed(int);
	method public default void onVirtualDeviceCreated(int);		method public default void onVirtualDeviceCreated(int);
	}		}
	@@ -17653,13 +17653,13 @@ package android.graphics.pdf {
	package android.graphics.text {		package android.graphics.text {

	public final class LineBreakConfig {		public final class LineBreakConfig {
	method @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN) public int getHyphenation();		method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public int getHyphenation();
	method public int getLineBreakStyle();		method public int getLineBreakStyle();
	method public int getLineBreakWordStyle();		method public int getLineBreakWordStyle();
	method @NonNull public android.graphics.text.LineBreakConfig merge(@NonNull android.graphics.text.LineBreakConfig);		method @NonNull public android.graphics.text.LineBreakConfig merge(@NonNull android.graphics.text.LineBreakConfig);
	field @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN) public static final int HYPHENATION_DISABLED = 0; // 0x0		field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int HYPHENATION_DISABLED = 0; // 0x0
	field @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN) public static final int HYPHENATION_ENABLED = 1; // 0x1		field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int HYPHENATION_ENABLED = 1; // 0x1
	field @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN) public static final int HYPHENATION_UNSPECIFIED = -1; // 0xffffffff		field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int HYPHENATION_UNSPECIFIED = -1; // 0xffffffff
	field public static final int LINE_BREAK_STYLE_LOOSE = 1; // 0x1		field public static final int LINE_BREAK_STYLE_LOOSE = 1; // 0x1
	field public static final int LINE_BREAK_STYLE_NONE = 0; // 0x0		field public static final int LINE_BREAK_STYLE_NONE = 0; // 0x0
	field public static final int LINE_BREAK_STYLE_NORMAL = 2; // 0x2		field public static final int LINE_BREAK_STYLE_NORMAL = 2; // 0x2
	@@ -17674,7 +17674,7 @@ package android.graphics.text {
	ctor public LineBreakConfig.Builder();		ctor public LineBreakConfig.Builder();
	method @NonNull public android.graphics.text.LineBreakConfig build();		method @NonNull public android.graphics.text.LineBreakConfig build();