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

Commit 591b371f authored by Chris Tate's avatar Chris Tate Committed by Android Git Automerger
Browse files

am ccbb02f9: am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for... 

am ccbb02f9: am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev

* commit 'ccbb02f9':
  Clean up properly if outcall for doRestoreFinished() fails
parents 338b0556 ccbb02f9

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -7848,8 +7848,12 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF 
                // If we get this far, the callback or timeout will schedule the

                // If we get this far, the callback or timeout will schedule the

                // next restore state, so we're done

                // next restore state, so we're done

            } catch (Exception e) {

            } catch (Exception e) {

                Slog.e(TAG, "Unable to finalize restore of " + mCurrentPackage.packageName);

                final String packageName = mCurrentPackage.packageName;

                executeNextState(UnifiedRestoreState.FINAL);

                Slog.e(TAG, "Unable to finalize restore of " + packageName);

                EventLog.writeEvent(EventLogTags.RESTORE_AGENT_FAILURE,

                        packageName, e.toString());

                keyValueAgentErrorCleanup();

                executeNextState(UnifiedRestoreState.RUNNING_QUEUE);

            }

            }

        }

        }