tree 7253167bc409043d3e4056301b1db028744b2045
parent a7f869705ab25b16a2dab8e28170e2b239758f55
parent 91d4d5e2394917ad492721ec227eb4be0b376cae
author Nagi Marupaka <nmarupaka@google.com> 1642184914 +0000
committer Nagi Marupaka <nmarupaka@google.com> 1643762359 +0000

Merge cros/upstream to cros/master

Contains the following commits:
 91d4d5e collection-basic: add PDC Register and Refresh (Eric Caruso)
 fd94480 qmicli-wms: add Set Routes command (Eric Caruso)
 18d77e2 qmicli: wds-bind-mux-data-port ep-type option missed value (Nikita Orlov)
 869f578 qmi-proxy: removing assert when attempting to close ghost device (vpodshiv)
 a7891c4 gas: add request for getting the current USB composition (Daniele Palmas)
 d82dbd0 gas: add request for switching USB composition (Daniele Palmas)
 6dc0caf build: version bump to flag existence of new API (new 5GNR apis) (Aleksander Morgado)
 d0c1b31 nas: Implement "5G Signal Strength" TLV in "Signal Info" indication (Prakash Pabba)
 176cc09 dms: Implement "NR5G Band Capability" TLV in "Get Band Capabilities" (Prakash Pabba)
 89e5257 nas: Implement "NR5G SA/NSA band preference" TLVs in "Get System Selection Preference" (Prakash Pabba)
 0b29792 build: Make feature options boolean (Iñigo Martínez)
 4210314 ci: switch to trigger pipelines on the 'main' branch (Aleksander Morgado)
 c4c85e9 RELEASING: update default branch name to 'main' (Aleksander Morgado)
 430b678 swi-update: avoid using 'sanity' (Aleksander Morgado)
 565fdf2 qmi-firmware-update: replace 'dummy' with 'placeholder' (Aleksander Morgado)
 236df67 qmicli,uim: replace 'dummy' with 'placeholder' (Aleksander Morgado)
 295b75e build: add an option to not build man pages (Aleksander Morgado)
 d960af3 build: Fix double quotes in rules file (Iñigo Martínez)
 b5bd693 collection,basic: Add QMI_MESSAGE_WDS_SET_LTE_ATTACH_PDN_LIST to basic collection (Andrew Lassalle)
 9739699 libqmi-glib,rmnet: per flag symbol safeguards (Aleksander Morgado)
 043f475 qmi-device: add QMAPv5 link creation flags (Sean Tranchetti)
 653b3b8 build: Remove the unnecessary check to enable rmnet (Iñigo Martínez)
 698c079 build: version bump to flag existence of new API (QMI_DMS_RADIO_INTERFACE_TDS) (Aleksander Morgado)
 342eb5a qmi-firmware-update: use defaults if FLASH variables not reported (Aleksander Morgado)
 49aae4d libqmi-glib: add DMS radio interface TDS value (Daniele Palmas)
 b4b50c1 qmicli,gms: Remove duplicate memory free (Ana Cabral)
 96b89cc ci: bump image template to refresh CA certificates (Aleksander Morgado)

BUG=b:209486121
TEST=emerge-trogdor libqmi && cros deploy && run tast

Cq-Depend: chromium:3389699, chromium:3400189, chromium:3389829, chromium:3417870
Change-Id: I2f67ba06b21fb44c52d3429d995b38016a7625df