Merge cros/upstream to cros/main - 1.30-rc1
Part of an uprev that contains the following commits:
" 0d741ce bump version to 1.29.900 (1.30-rc1) (Aleksander Morgado)"
" bac55a4 NEWS: update for 1.30.0 (Aleksander Morgado)"
" 346dcc9 libmbim-glib,enums: fix since tag in MbimTraceCommand (Aleksander Morgado)"
" 9fae3d7 libmbim-glib,uuid: minor alignment fix (Aleksander Morgado)"
" 3b892bc mbimcli,intel-tools: add 'intel' prefix in actions (Aleksander Morgado)"
" 167a9fb mbimcli,intel-mutual-authentication: add 'intel' prefix in action names (Aleksander Morgado)"
" e7b6abe mbim-message: bounds-check TLV offset (Eric Caruso)"
" 91acf21 mbim-tlv: check for overflow with tlv length (Eric Caruso)"
BUG=b:300030998
FIXED=b:300030998
TEST=None
Change-Id: Ic75c07bed9d6430e642cac74241fb2cf332f8269
diff --git a/DIR_METADATA b/DIR_METADATA
new file mode 100644
index 0000000..5d046e9
--- /dev/null
+++ b/DIR_METADATA
@@ -0,0 +1,43 @@
+# 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
+
+team_email: "cros-cellular-core@google.com"
+
+buganizer {
+ # https://b.corp.google.com/issues?q=status:open%20componentid:167157
+ # ChromeOS > Platform > Connectivity > Cellular
+ component_id: 167157
+}
+
+chromeos {
+ cq {
+ # See go/cros-cq-test-config
+ 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/cellular_cq.star"
+ }
+ }
+ }
+}
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..9712978
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,7 @@
+set noparent
+ejcaruso@chromium.org
+pholla@chromium.org
+andrewlassalle@chromium.org
+madhavadas@google.com
+nmarupaka@google.com
+aleksandermj@google.com
diff --git a/PRESUBMIT.cfg b/PRESUBMIT.cfg
new file mode 100644
index 0000000..51d8dd6
--- /dev/null
+++ b/PRESUBMIT.cfg
@@ -0,0 +1,9 @@
+# This sample config file disables all of the ChromiumOS source style checks.
+# Comment out the disable-flags for any checks you want to leave enabled.
+
+[Hook Overrides]
+stray_whitespace_check: false
+long_line_check: false
+cros_license_check: false
+tab_check: false
+
diff --git a/README.chromium b/README.chromium
new file mode 100644
index 0000000..0ad12ac
--- /dev/null
+++ b/README.chromium
@@ -0,0 +1,6 @@
+URL: http://cgit.freedesktop.org/libmbim/libmbim/
+License: GPLv2
+License File: COPYING
+
+Description:
+ MBIM modem protocol helper library.
diff --git a/src/libmbim-glib/mbim-device.c b/src/libmbim-glib/mbim-device.c
index 401aaa9..89aa921 100644
--- a/src/libmbim-glib/mbim-device.c
+++ b/src/libmbim-glib/mbim-device.c
@@ -978,21 +978,24 @@
(MBIM_MESSAGE_GET_MESSAGE_TYPE (message) - 0x80000000),
mbim_message_get_transaction_id (message));
if (!task) {
- g_autofree gchar *printable = NULL;
-
g_debug ("[%s] no transaction matched in received message",
self->priv->path_display);
+
/* Attempt to print a user friendly dump of the packet anyway */
- printable = mbim_message_get_printable_full (message,
- self->priv->ms_mbimex_version_major,
- self->priv->ms_mbimex_version_minor,
- ">>>>>> ",
- is_partial_fragment,
- NULL);
- if (printable)
- g_debug ("[%s] received unexpected message (translated)...\n%s",
- self->priv->path_display,
- printable);
+ if (mbim_utils_get_traces_enabled ()) {
+ g_autofree gchar *printable = NULL;
+
+ printable = mbim_message_get_printable_full (message,
+ self->priv->ms_mbimex_version_major,
+ self->priv->ms_mbimex_version_minor,
+ ">>>>>> ",
+ is_partial_fragment,
+ NULL);
+ if (printable)
+ g_debug ("[%s] received unexpected message (translated)...\n%s",
+ self->priv->path_display,
+ printable);
+ }
/* If we're opening and we get a CLOSE_DONE message without any
* matched transaction, finalize the open request right away to
diff --git a/unblocked_terms.txt b/unblocked_terms.txt
new file mode 100644
index 0000000..60d3f36
--- /dev/null
+++ b/unblocked_terms.txt
@@ -0,0 +1,7 @@
+# Don't delete this file if you want to keep keyword_check enabled even if it's
+# empty.
+# See repohooks/README.md for more details.
+black.?list
+dummy
+\bhe\b
+\bshe\b
