Snap for 6302218 from 0ecf11412ef20476475fb4aa4ffd5d159a8fa8fb to mainline-release (06edd6a5) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+17 −10

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ packages_to_document = [
		]

		stubs_defaults {
		name: "metalava-non-updatable-api-stubs-default",
		name: "metalava-base-api-stubs-default",
		srcs: [
		":framework-non-updatable-sources",
		"core/java/*/.logtags",
		@@ -70,12 +70,18 @@ stubs_defaults {
		}

		stubs_defaults {
		name: "metalava-api-stubs-default",
		defaults: ["metalava-non-updatable-api-stubs-default"],
		name: "metalava-full-api-stubs-default",
		defaults: ["metalava-base-api-stubs-default"],
		srcs: [":framework-updatable-sources"],
		sdk_version: "core_platform",
		}

		stubs_defaults {
		name: "metalava-non-updatable-api-stubs-default",
		defaults: ["metalava-base-api-stubs-default"],
		sdk_version: "system_current",
		}

		/////////////////////////////////////////////////////////////////////
		// *-api-stubs-docs modules providing source files for the stub libraries
		/////////////////////////////////////////////////////////////////////
		@@ -85,7 +91,7 @@ stubs_defaults {
		// modules
		droidstubs {
		name: "api-stubs-docs",
		defaults: ["metalava-api-stubs-default"],
		defaults: ["metalava-full-api-stubs-default"],
		api_filename: "public_api.txt",
		private_api_filename: "private.txt",
		removed_api_filename: "removed.txt",
		@@ -124,7 +130,7 @@ module_libs = " " +

		droidstubs {
		name: "system-api-stubs-docs",
		defaults: ["metalava-api-stubs-default"],
		defaults: ["metalava-full-api-stubs-default"],
		api_tag_name: "SYSTEM",
		api_filename: "system-api.txt",
		private_api_filename: "system-private.txt",
		@@ -155,7 +161,7 @@ droidstubs {

		droidstubs {
		name: "test-api-stubs-docs",
		defaults: ["metalava-api-stubs-default"],
		defaults: ["metalava-full-api-stubs-default"],
		api_tag_name: "TEST",
		api_filename: "test-api.txt",
		removed_api_filename: "test-removed.txt",
		@@ -188,7 +194,7 @@ droidstubs {

		droidstubs {
		name: "module-lib-api",
		defaults: ["metalava-api-stubs-default"],
		defaults: ["metalava-full-api-stubs-default"],
		arg_files: ["core/res/AndroidManifest.xml"],
		args: metalava_framework_docs_args + module_libs,
		check_api: {
		@@ -216,7 +222,7 @@ droidstubs {

		droidstubs {
		name: "module-lib-api-stubs-docs",
		defaults: ["metalava-api-stubs-default"],
		defaults: ["metalava-non-updatable-api-stubs-default"],
		arg_files: ["core/res/AndroidManifest.xml"],
		args: metalava_framework_docs_args + priv_apps + module_libs,
		}
		@@ -266,6 +272,7 @@ java_library_static {
		name: "android_module_lib_stubs_current",
		srcs: [ ":module-lib-api-stubs-docs" ],
		defaults: ["framework-stubs-default"],
		libs: ["android_system_stubs_current"],
		}

		/////////////////////////////////////////////////////////////////////
		@@ -317,7 +324,7 @@ java_library_static {

		droidstubs {
		name: "hiddenapi-lists-docs",
		defaults: ["metalava-api-stubs-default"],
		defaults: ["metalava-full-api-stubs-default"],
		arg_files: [
		"core/res/AndroidManifest.xml",
		],
		@@ -332,7 +339,7 @@ droidstubs {

		droidstubs {
		name: "hiddenapi-mappings",
		defaults: ["metalava-api-stubs-default"],
		defaults: ["metalava-full-api-stubs-default"],
		srcs: [
		":opt-telephony-common-srcs",
		],

apex/Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ stubs_defaults {
		stubs_defaults {
		name: "framework-module-stubs-defaults-systemapi",
		args: mainline_stubs_args + priv_apps,
		srcs: [":framework-annotations"],
		libs: ["framework-annotations-lib"],
		installable: false,
		sdk_version: "system_current",
		}
		@@ -62,7 +62,7 @@ stubs_defaults {
		stubs_defaults {
		name: "framework-module-api-defaults-module_libs_api",
		args: mainline_stubs_args + module_libs,
		srcs: [":framework-annotations"],
		libs: ["framework-annotations-lib"],
		installable: false,
		sdk_version: "module_current",
		}
		@@ -70,7 +70,7 @@ stubs_defaults {
		stubs_defaults {
		name: "framework-module-stubs-defaults-module_libs_api",
		args: mainline_stubs_args + module_libs + priv_apps,
		srcs: [":framework-annotations"],
		libs: ["framework-annotations-lib"],
		installable: false,
		sdk_version: "module_current",
		}

api/current.txt

+4 −6

Original line number	Diff line number	Diff line
		@@ -37160,12 +37160,10 @@ package android.os {
		method @Nullable public android.os.VibrationEffect.Composition addPrimitive(int, @FloatRange(from=0.0f, to=1.0f) float, @IntRange(from=0) int);
		method @NonNull public android.os.VibrationEffect compose();
		field public static final int PRIMITIVE_CLICK = 1; // 0x1
		field public static final int PRIMITIVE_LIGHT_TICK = 7; // 0x7
		field public static final int PRIMITIVE_QUICK_FALL = 6; // 0x6
		field public static final int PRIMITIVE_QUICK_RISE = 4; // 0x4
		field public static final int PRIMITIVE_SLOW_RISE = 5; // 0x5
		field public static final int PRIMITIVE_SPIN = 3; // 0x3
		field public static final int PRIMITIVE_THUD = 2; // 0x2
		field public static final int PRIMITIVE_TICK = 7; // 0x7
		}

		public abstract class Vibrator {
		@@ -49000,8 +48998,8 @@ package android.telephony.ims {
		ctor public RegistrationManager.RegistrationCallback();
		method public void onRegistered(int);
		method public void onRegistering(int);
		method public void onTechnologyChangeFailed(int, @Nullable android.telephony.ims.ImsReasonInfo);
		method public void onUnregistered(@Nullable android.telephony.ims.ImsReasonInfo);
		method public void onTechnologyChangeFailed(int, @NonNull android.telephony.ims.ImsReasonInfo);
		method public void onUnregistered(@NonNull android.telephony.ims.ImsReasonInfo);
		}

		}
		@@ -55588,7 +55586,7 @@ package android.view {

		public interface WindowInsetsController {
		method public void addOnControllableInsetsChangedListener(@NonNull android.view.WindowInsetsController.OnControllableInsetsChangedListener);
		method @NonNull public android.os.CancellationSignal controlWindowInsetsAnimation(int, long, @Nullable android.view.animation.Interpolator, @NonNull android.view.WindowInsetsAnimationControlListener);
		method public void controlWindowInsetsAnimation(int, long, @Nullable android.view.animation.Interpolator, @Nullable android.os.CancellationSignal, @NonNull android.view.WindowInsetsAnimationControlListener);
		method public int getSystemBarsAppearance();
		method public int getSystemBarsBehavior();
		method public void hide(int);

api/module-lib-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ package android.net {
		field @NonNull public static final android.os.Parcelable.Creator<android.net.TetheredClient.AddressInfo> CREATOR;
		}

		public class TetheringConstants {
		public final class TetheringConstants {
		field public static final String EXTRA_ADD_TETHER_TYPE = "extraAddTetherType";
		field public static final String EXTRA_PROVISION_CALLBACK = "extraProvisionCallback";
		field public static final String EXTRA_REM_TETHER_TYPE = "extraRemTetherType";

api/system-current.txt

+2 −190

File changed.

Preview size limit exceeded, changes collapsed.