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

Commit 445d25d0 authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Merge "Add a default error code when updater script aborts" am: 89394632 am:... 

Merge "Add a default error code when updater script aborts" am: 89394632 am: 18bb9a4f am: 7a1c2943
am: 03f740ec

Change-Id: I3927cb4801a5b06467120a5e8c1c112438f86235
parents a616f0d4 03f740ec

error_code.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ enum ErrorCode { 
  kZipOpenFailure,

  kBootreasonInBlacklist,

  kPackageCompatibilityFailure,

  kScriptExecutionFailure,

};



enum CauseCode {

updater/updater.cpp

+9 −7
Original line number Diff line number Diff line
@@ -193,14 +193,16 @@ int main(int argc, char** argv) { 
      }

    }



    if (state.error_code != kNoError) {

    // Installation has been aborted. Set the error code to kScriptExecutionFailure unless

    // a more specific code has been set in errmsg.

    if (state.error_code == kNoError) {

      state.error_code = kScriptExecutionFailure;

    }

    fprintf(cmd_pipe, "log error: %d\n", state.error_code);

      // Cause code should provide additional information about the abort;

      // report only when an error exists.

    // Cause code should provide additional information about the abort.

    if (state.cause_code != kNoCause) {

      fprintf(cmd_pipe, "log cause: %d\n", state.cause_code);

    }

    }



    if (updater_info.package_zip) {

      CloseArchive(updater_info.package_zip);