Snap for 12032182 from 318156051f938489fc61b438505c8ee537351cc7 to 24Q4-release (98be986e) · Commits · e / os / android_frameworks_base

api/gen_combined_removed_dex.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,6 @@ shift 2

		# Convert each removed.txt to the "dex format" equivalent, and print all output.
		for f in "$@"; do
		"$metalava_path" signature-to-dex "$f" "${tmp_dir}/tmp"
		"$metalava_path" signature-to-dex "$f" --out "${tmp_dir}/tmp"
		cat "${tmp_dir}/tmp"
		done

core/api/module-lib-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -318,6 +318,14 @@ package android.net.netstats {

		}

		package android.net.wifi {

		public final class WifiMigration {
		method @FlaggedApi("android.net.wifi.flags.legacy_keystore_to_wifi_blobstore_migration") public static void migrateLegacyKeystoreToWifiBlobstore();
		}

		}

		package android.nfc {

		public class NfcServiceManager {

core/api/system-current.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -3447,6 +3447,7 @@ package android.companion.virtual {
		}

		public static interface VirtualDeviceManager.ActivityListener {
		method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") public default void onActivityLaunchBlocked(int, @NonNull android.content.ComponentName, int);
		method public void onDisplayEmpty(int);
		method @Deprecated public void onTopActivityChanged(int, @NonNull android.content.ComponentName);
		method public default void onTopActivityChanged(int, @NonNull android.content.ComponentName, int);
		@@ -11399,8 +11400,9 @@ package android.os.connectivity {
		method public long getNumPacketsTx();
		method public long getRxTimeMillis();
		method public long getSleepTimeMillis();
		method @NonNull public long getTimeInRatMicros(int);
		method @NonNull public long getTimeInRxSignalStrengthLevelMicros(@IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) int);
		method public long getTimeInRatMicros(int);
		method public long getTimeInRxSignalStrengthLevelMicros(@IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) int);
		method @FlaggedApi("com.android.server.power.optimization.streamlined_connectivity_battery_stats") public long getTxTimeMillis(@IntRange(from=android.telephony.ModemActivityInfo.TX_POWER_LEVEL_0, to=android.telephony.ModemActivityInfo.TX_POWER_LEVEL_4) int);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.os.connectivity.CellularBatteryStats> CREATOR;
		}

core/api/test-current.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -2608,6 +2608,18 @@ package android.os {

		}

		package android.os.connectivity {

		public final class CellularBatteryStats implements android.os.Parcelable {
		ctor @FlaggedApi("com.android.server.power.optimization.streamlined_connectivity_battery_stats") public CellularBatteryStats(long, long, long, long, long, long, long, long, long, long, @NonNull long[], @NonNull long[], @NonNull long[], long);
		}

		public final class WifiBatteryStats implements android.os.Parcelable {
		ctor @FlaggedApi("com.android.server.power.optimization.streamlined_connectivity_battery_stats") public WifiBatteryStats(long, long, long, long, long, long, long, long, long, long, long, long, long, @NonNull long[], @NonNull long[], @NonNull long[], long);
		}

		}

		package android.os.health {

		public class HealthKeys {

core/java/Android.bp

+33 −0

Original line number	Diff line number	Diff line
		@@ -20,10 +20,43 @@ filegroup {
		"*/.java",
		"*/.aidl",
		":framework-nfc-non-updatable-sources",
		":messagequeue-gen",
		],
		// Exactly one of the below will be added to srcs by messagequeue-gen
		exclude_srcs: [
		"android/os/LegacyMessageQueue/MessageQueue.java",
		"android/os/ConcurrentMessageQueue/MessageQueue.java",
		"android/os/SemiConcurrentMessageQueue/MessageQueue.java",
		],
		visibility: ["//frameworks/base"],
		}

		// Add selected MessageQueue.java implementation to srcs
		soong_config_module_type {
		name: "release_package_messagequeue_implementation_srcs",
		module_type: "genrule",
		config_namespace: "messagequeue",
		value_variables: ["release_package_messagequeue_implementation"],
		properties: [
		"srcs",
		],
		}

		// Output the selected android/os/MessageQueue.java implementation
		release_package_messagequeue_implementation_srcs {
		name: "messagequeue-gen",
		soong_config_variables: {
		release_package_messagequeue_implementation: {
		srcs: ["android/os/%s"],
		conditions_default: {
		srcs: ["android/os/LegacyMessageQueue/MessageQueue.java"],
		},
		},
		},
		cmd: "mkdir -p android/os/; cp $(in) $(out);",
		out: ["android/os/MessageQueue.java"],
		}

		aidl_library {
		name: "IDropBoxManagerService_aidl",
		srcs: [