Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42bc0e94 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Fix deadlock in BackupManagerService"

parents cace13d7 4559764e
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -760,6 +760,7 @@ class BackupManagerService extends IBackupManager.Stub {
                    sf.delete();
                }
            }
        }

        // Enqueue a new backup of every participant
        int N = mBackupParticipants.size();
@@ -771,7 +772,6 @@ class BackupManagerService extends IBackupManager.Stub {
            }
        }
    }
    }

    // Add a transport to our set of available backends.  If 'transport' is null, this
    // is an unregistration, and the transport's entry is removed from our bookkeeping.