Merge tag 'android-security-11.0.0_r54' into int/11/fp3
Android security 11.0.0 release 54
* tag 'android-security-11.0.0_r54':
Use after free in phTmlNfc_TmlThread
Change-Id: Ia9c01faa8ead87e2c25748a6e364c8e0ffa96bc4
diff --git a/halimpl/tml/phTmlNfc.cc b/halimpl/tml/phTmlNfc.cc
index b3135c1..52140ea 100644
--- a/halimpl/tml/phTmlNfc.cc
+++ b/halimpl/tml/phTmlNfc.cc
@@ -152,7 +152,7 @@
/* Clean up all the TML resources if any error */
if (NFCSTATUS_SUCCESS != wInitStatus) {
/* Clear all handles and memory locations initialized during init */
- phTmlNfc_CleanUp();
+ phTmlNfc_Shutdown_CleanUp();
}
return wInitStatus;