commit 84e34e35c0de6847aa5d079d083de77d1b87a0e9
author Jack Yu <jackcwyu@google.com> Wed Oct 30 16:54:23 2019 +0800
committer George Chang <georgekgchang@google.com> Wed Nov 13 02:44:15 2019 +0000
tree 7a929b17a5bc820d539b082094ec334561b44787
parent 93ff08e639170900baf8752fa965ad039163fdc8

Do not consider SE error status code as IO error

Bug: 142871417
Test: SE service launch successfully
Merged-In: Ic2058c724bf800189e31b3a7d9770c8d6aed49fc
Change-Id: Ic2058c724bf800189e31b3a7d9770c8d6aed49fc

1.0/SecureElement.cpp

diff --git a/1.0/SecureElement.cpp b/1.0/SecureElement.cpp
index a216a76..a84c67b 100644
--- a/1.0/SecureElement.cpp
+++ b/1.0/SecureElement.cpp
@@ -137,7 +137,7 @@
     }
   }
 
-  SecureElementStatus sestatus = SecureElementStatus::IOERROR;
+  SecureElementStatus sestatus = SecureElementStatus::FAILED;
   ESESTATUS status = ESESTATUS_FAILED;
   StEse_data cmdApdu;
   StEse_data rspApdu;
@@ -191,7 +191,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));
@@ -275,7 +275,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;