Merge AOSP android16-qpr1-release into master
BUG=b:453566301
TEST=bluetooth_AdapterQuickHealth.AVL.all_floss
TEST=bluetooth_AdapterQuickHealth.AVL.all_floss.unstable_aflags
Change-Id: I8fcee0afdd63bf8fcdf3f09cb2243b6614f5e67e
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/frameworks/proto_logging/+/7155650
Reviewed-by: Michael Sun <michaelfsun@google.com>
Commit-Queue: ChromeOS Auto Retry <chromeos-auto-retry@chromeos-bot.iam.gserviceaccount.com>
Tested-by: Hsin-chen Chuang <chharry@google.com>
diff --git a/DIR_METADATA b/DIR_METADATA
new file mode 100644
index 0000000..53e207b
--- /dev/null
+++ b/DIR_METADATA
@@ -0,0 +1,40 @@
+# Metadata information for this directory.
+#
+# For more information on DIR_METADATA files, see:
+# https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/README.md
+#
+# For the schema of this file, see Metadata message:
+# https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/proto/dir_metadata.proto
+
+buganizer {
+ component_id: 167317 # ChromeOS > Platform > Connectivity > Bluetooth
+}
+
+team_email: "chromeos-bt-all@google.com"
+
+chromeos {
+ cq {
+ source_test_plans {
+ test_plan_starlark_files {
+ host: "chrome-internal.googlesource.com"
+ project: "chromeos/config-internal"
+ path: "test/plans/v2/ctpv1_compatible/legacy_default_tast_hw.star"
+ }
+ test_plan_starlark_files {
+ host: "chrome-internal.googlesource.com"
+ project: "chromeos/config-internal"
+ path: "test/plans/v2/ctpv1_compatible/legacy_default_autotest_hw.star"
+ }
+ test_plan_starlark_files {
+ host: "chrome-internal.googlesource.com"
+ project: "chromeos/config-internal"
+ path: "test/plans/v2/ctpv1_compatible/legacy_default_vm.star"
+ }
+ test_plan_starlark_files {
+ host: "chrome-internal.googlesource.com"
+ project: "chromeos/config-internal"
+ path: "test/plans/v2/ctpv1_compatible/bluetooth_floss_cq.star"
+ }
+ }
+ }
+}
diff --git a/stats/atoms/framework/framework_extension_atoms.proto b/stats/atoms/framework/framework_extension_atoms.proto
index 19f23d8..c68deeb 100644
--- a/stats/atoms/framework/framework_extension_atoms.proto
+++ b/stats/atoms/framework/framework_extension_atoms.proto
@@ -69,6 +69,8 @@
optional DeviceStateAutoRotateSettingIssueReported device_state_auto_rotate_setting_issue_reported = 1011 [(module) = "framework"];
optional ProcessTextActionLaunchedReported process_text_action_launched_reported = 1016 [(module) = "framework"];
optional IntentRedirectBlocked intent_redirect_blocked = 1037 [(module) = "framework"];
+ optional AndroidGraphicsBitmapAllocated android_graphics_bitmap_allocated =
+ 1039 [(module) = "framework"];
optional WidgetMemoryStats widget_memory_stats = 10234 [(module) = "framework"];
optional AdvancedProtectionStateChanged advanced_protection_state_changed = 1040 [(module) = "framework"];
optional AdvancedProtectionSupportDialogDisplayed advanced_protection_support_dialog_displayed = 1041 [(module) = "framework"];
@@ -864,6 +866,20 @@
}
/**
+ * Records Bitmap allocations.
+ *
+ * Logged via Hummingbird for probes at android.graphics.Bitmap constructor.
+ *
+ * Estimated Logging Rate:
+ * Peak: 100 times in a minute | Avg: O(hundreds) per device per day
+ */
+message AndroidGraphicsBitmapAllocated {
+ optional int32 uid = 1 [(is_uid) = true];
+ optional int32 width = 2;
+ optional int32 height = 3;
+}
+
+/**
* [Pushed Atom] Logs when an AppOp is accessed through noteOp, startOp, finishOp and that access
* history can be stored in the AppOp discrete access data store.
*
diff --git a/stats/atoms/uprobestats/uprobestats_extension_atoms.proto b/stats/atoms/uprobestats/uprobestats_extension_atoms.proto
index 06585eb..bcce0cf 100644
--- a/stats/atoms/uprobestats/uprobestats_extension_atoms.proto
+++ b/stats/atoms/uprobestats/uprobestats_extension_atoms.proto
@@ -187,4 +187,4 @@
SNAPSHOT_TYPE_MAX_ALLOCATION_SIZE = 2;
}
optional SnapshotType snapshot_type = 6;
-}
\ No newline at end of file
+}
