Merge cros/upstream to cros/main - 1.35.6-dev
Part of an uprev that contains the following commits:
" aece0bba build: unstable release version bump to 1.35.6 (Aleksander Morgado)"
" 4c9a8923 libqmi-glib,wds: add missing QmiWdsApnTypeMask flag values (Aleksander Morgado)"
BUG=b:355655100
FIXED=b:355655100
TEST=None
Change-Id: I59719fbb2f304e89492df9792ecea496c4b6e7ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/libqmi/+/5802941
Commit-Queue: Aleksander Morgado <aleksandermj@google.com>
Tested-by: Aleksander Morgado <aleksandermj@google.com>
Reviewed-by: Daniel Winkler <danielwinkler@google.com>
diff --git a/meson.build b/meson.build
index 85266d1..9488312 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@
project(
'libqmi', 'c',
- version: '1.35.5',
+ version: '1.35.6',
license: 'GPL2',
default_options: [
'buildtype=debugoptimized',
diff --git a/src/libqmi-glib/qmi-flags64-wds.h b/src/libqmi-glib/qmi-flags64-wds.h
index 95e7700..78cba9b 100644
--- a/src/libqmi-glib/qmi-flags64-wds.h
+++ b/src/libqmi-glib/qmi-flags64-wds.h
@@ -34,9 +34,15 @@
* @QMI_WDS_APN_TYPE_MASK_DEFAULT: Default/Internet traffic.
* @QMI_WDS_APN_TYPE_MASK_IMS: IP Multimedia Subsystem.
* @QMI_WDS_APN_TYPE_MASK_MMS: Multimedia Messaging Service.
+ * @QMI_WDS_APN_TYPE_MASK_DUN: DUN/tethering. Since 1.36.
+ * @QMI_WDS_APN_TYPE_MASK_SUPL: SUPL server access. Since 1.36.
+ * @QMI_WDS_APN_TYPE_MASK_HIPRI: Hi priority. Since 1.36.
* @QMI_WDS_APN_TYPE_MASK_FOTA: over the air administration.
+ * @QMI_WDS_APN_TYPE_MASK_CBS: CBS. Since 1.36.
* @QMI_WDS_APN_TYPE_MASK_IA: Initial Attach.
* @QMI_WDS_APN_TYPE_MASK_EMERGENCY: Emergency.
+ * @QMI_WDS_APN_TYPE_MASK_UT: UT. Since 1.36.
+ * @QMI_WDS_APN_TYPE_MASK_MCX: Mission critical service. Since 1.36.
*
* APN type as a bitmask.
*
@@ -46,9 +52,15 @@
QMI_WDS_APN_TYPE_MASK_DEFAULT = ((guint64) 1) << 0,
QMI_WDS_APN_TYPE_MASK_IMS = ((guint64) 1) << 1,
QMI_WDS_APN_TYPE_MASK_MMS = ((guint64) 1) << 2,
+ QMI_WDS_APN_TYPE_MASK_DUN = ((guint64) 1) << 3,
+ QMI_WDS_APN_TYPE_MASK_SUPL = ((guint64) 1) << 4,
+ QMI_WDS_APN_TYPE_MASK_HIPRI = ((guint64) 1) << 5,
QMI_WDS_APN_TYPE_MASK_FOTA = ((guint64) 1) << 6,
+ QMI_WDS_APN_TYPE_MASK_CBS = ((guint64) 1) << 7,
QMI_WDS_APN_TYPE_MASK_IA = ((guint64) 1) << 8,
QMI_WDS_APN_TYPE_MASK_EMERGENCY = ((guint64) 1) << 9,
+ QMI_WDS_APN_TYPE_MASK_UT = ((guint64) 1) << 10,
+ QMI_WDS_APN_TYPE_MASK_MCX = ((guint64) 1) << 11,
} QmiWdsApnTypeMask;
#endif /* _LIBQMI_GLIB_QMI_FLAGS64_WDS_H_ */