commit efb711581fabcb68d7f00d667c8c5eac1b4e167f
author Nagi Marupaka <nmarupaka@google.com> Tue Feb 28 01:10:43 2023
committer Nagi Marupaka <nmarupaka@google.com> Tue Feb 28 01:15:42 2023
tree baecd93e63238a66477cd33325141040f2436b93
parent 223b2be7795b6f24adb2e146c28a40932d65c04a
parent 122e68dfab5822831be42bcf95cb6a8c9463ddea

Merge cros/upstream to cros/main - 1.29.4-dev

Part of an uprev that contains the following commits:

" 122e68d build: unstable release version bump to 1.29.4 (Aleksander Morgado)"
" db1879c libmbim-glib,uuid: fix context type conversions to allow all values (Aleksander Morgado)"

BUG=b:268166384
FIXED=b:268166384

TEST=None

Change-Id: Ifa7e48e6cb2a2cd5902a3df27d018f5cf9da4f6b

meson.build

diff --git a/meson.build b/meson.build
index 01efcbb..a536a84 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@
 
 project(
   'libmbim', 'c',
-  version: '1.29.3',
+  version: '1.29.4',
   license: ['GPL-2.0-or-later', 'LGPL-2.1-or-later'],
   default_options: [
     'buildtype=debugoptimized',

src/libmbim-glib/mbim-uuid.c

diff --git a/src/libmbim-glib/mbim-uuid.c b/src/libmbim-glib/mbim-uuid.c
index e734b9b..4c5aac9 100644
--- a/src/libmbim-glib/mbim-uuid.c
+++ b/src/libmbim-glib/mbim-uuid.c
@@ -619,7 +619,7 @@
 const MbimUuid *
 mbim_uuid_from_context_type (MbimContextType context_type)
 {
-    g_return_val_if_fail (context_type <= MBIM_CONTEXT_TYPE_LOCAL, &uuid_invalid);
+    g_return_val_if_fail (context_type <= MBIM_CONTEXT_TYPE_EMERGENCY_CALLING, &uuid_invalid);
 
     switch (context_type) {
     case MBIM_CONTEXT_TYPE_INVALID: