commit 250963698a92841c24b30b1df18a2bb6ac85f8f4
author Pavan Holla <pholla@chromium.org> Thu Oct 08 15:46:36 2020
committer Commit Bot <commit-bot@chromium.org> Fri Oct 09 22:12:18 2020
tree 9881143ba467b3e5dccba50ee92cb6efe6b033f7
parent 98e6740e74c58fdefa98f6fcac6f06cd90d2dc42

Merge commit 'cros/upstream~1' into 'cros/master'.

This cl fixes issues seen with autoconnect after suspend.

Contains the following commit:
b0c21263 broadband-modem: Disconnect bearers during disable (Pavan Holla)

BUG=b:170144157
TEST=powerd_dbus_suspend; press any key; check that cellular reconnects

Change-Id: I82a89c1892e71acadf1d75c74fd3058c410787b6
(cherry picked from commit 35d405ef13b98a8e0b2cc22ce38c8d3090db9636)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/modemmanager-next/+/2461055
Tested-by: Pavan Holla <pholla@google.com>
Reviewed-by: Sujit Kautkar <sujitka@chromium.org>
Reviewed-by: Andrew Lassalle <andrewlassalle@chromium.org>
Reviewed-by: Pavan Holla <pholla@google.com>
Commit-Queue: Pavan Holla <pholla@google.com>

src/mm-broadband-modem.c

diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 61a0740..d78a2ee 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -10864,7 +10864,7 @@
 {
     common_disable (MM_BROADBAND_MODEM (self),
                     TRUE, /* perform state updates */
-                    DISABLING_STEP_FIRST_AFTER_ENABLE_FAILED,
+                    DISABLING_STEP_FIRST,
                     cancellable,
                     callback,
                     user_data);