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

Commit 6ab2fb61 authored by Christopher Tate's avatar Christopher Tate
Browse files

Don't redundantly call transport.finishRestore() 

The RestoreSession is no longer responsible for calling finishRestore();
that happens as part of tidying up after running the restore itself,
even in failure cases.

Bug 22640096

Change-Id: I0be52af2ae8c2c1ac685e9904ccb8120f7fcf522
parent bdbec480

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

+2 −10
Original line number Diff line number Diff line
@@ -9535,17 +9535,9 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF 
            public void run() {

                // clean up the session's bookkeeping

                synchronized (mSession) {

                    try {

                        if (mSession.mRestoreTransport != null) {

                            mSession.mRestoreTransport.finishRestore();

                        }

                    } catch (Exception e) {

                        Slog.e(TAG, "Error in finishRestore", e);

                    } finally {

                    mSession.mRestoreTransport = null;

                    mSession.mEnded = true;

                }

                }



                // clean up the BackupManagerImpl side of the bookkeeping

                // and cancel any pending timeout message