commit 128c6b3b83a89e82f6dbc477ce81da9adc8a6ef9
author George Chang <georgekgchang@google.com> Fri Dec 06 01:15:33 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 06 01:15:33 2019 +0000
tree 0aab5e44d778683ee67c6892a95032d4dd21c2c7
parent 84e34e35c0de6847aa5d079d083de77d1b87a0e9
parent d43a6955840318414839a76ee91dcb9801d30eb3

Merge "Handle ARA-M requests by a proprietary library" into qt-qpr1-dev

1.0/SecureElement.cpp

diff --git a/1.0/SecureElement.cpp b/1.0/SecureElement.cpp
index 155a88a..a1bb997 100644
--- a/1.0/SecureElement.cpp
+++ b/1.0/SecureElement.cpp
@@ -168,7 +168,7 @@
     }
   }
 
-  SecureElementStatus sestatus = SecureElementStatus::IOERROR;
+  SecureElementStatus sestatus = SecureElementStatus::FAILED;
   ESESTATUS status = ESESTATUS_FAILED;
   StEse_data cmdApdu;
   StEse_data rspApdu;
@@ -229,7 +229,7 @@
 
   STLOG_HAL_D("%s: Sending selectApdu", __func__);
   /*Reset variables if manageChannel is success*/
-  sestatus = SecureElementStatus::IOERROR;
+  sestatus = SecureElementStatus::FAILED;
   status = ESESTATUS_FAILED;
 
   memset(&cmdApdu, 0x00, sizeof(StEse_data));
@@ -318,7 +318,7 @@
     }
   }
 
-  SecureElementStatus sestatus = SecureElementStatus::IOERROR;
+  SecureElementStatus sestatus = SecureElementStatus::FAILED;
   ESESTATUS status = ESESTATUS_FAILED;
   StEse_data cmdApdu;
   StEse_data rspApdu;

1.1/SecureElement.cpp

diff --git a/1.1/SecureElement.cpp b/1.1/SecureElement.cpp
index 222e48f..ba8c3b2 100644
--- a/1.1/SecureElement.cpp
+++ b/1.1/SecureElement.cpp
@@ -169,7 +169,7 @@
     }
   }
 
-  SecureElementStatus sestatus = SecureElementStatus::IOERROR;
+  SecureElementStatus sestatus = SecureElementStatus::FAILED;
   ESESTATUS status = ESESTATUS_FAILED;
   StEse_data cmdApdu;
   StEse_data rspApdu;
@@ -223,7 +223,7 @@
 
   STLOG_HAL_D("%s: Sending selectApdu", __func__);
   /*Reset variables if manageChannel is success*/
-  sestatus = SecureElementStatus::IOERROR;
+  sestatus = SecureElementStatus::FAILED;
   status = ESESTATUS_FAILED;
 
   memset(&cmdApdu, 0x00, sizeof(StEse_data));
@@ -307,7 +307,7 @@
     }
   }
 
-  SecureElementStatus sestatus = SecureElementStatus::IOERROR;
+  SecureElementStatus sestatus = SecureElementStatus::FAILED;
   ESESTATUS status = ESESTATUS_FAILED;
   StEse_data cmdApdu;
   StEse_data rspApdu;