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

Commit ea9f8a4d authored by Christopher Tate's avatar Christopher Tate Committed by The Android Open Source Project
Browse files

am a7de3845: Only write to the pending-backup journal when necessary 

Merge commit 'a7de3845'

* commit 'a7de3845':
  Only write to the pending-backup journal when necessary
parents 51759015 a7de3845

services/java/com/android/server/BackupManagerService.java

+6 −4
Original line number Diff line number Diff line
@@ -1212,12 +1212,14 @@ class BackupManagerService extends IBackupManager.Stub { 
                        // Add the caller to the set of pending backups.  If there is

                        // one already there, then overwrite it, but no harm done.

                        BackupRequest req = new BackupRequest(app, false);

                        mPendingBackups.put(app, req);



                        // Journal this request in case of crash

                        if (mPendingBackups.put(app, req) == null) {

                            // Journal this request in case of crash.  The put()

                            // operation returned null when this package was not already

                            // in the set; we want to avoid touching the disk redundantly.

                            writeToJournalLocked(packageName);

                        }

                    }

                }



                if (DEBUG) {

                    int numKeys = mPendingBackups.size();