summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArach MOHAMMED BRAHIM <arach.mohammed.brahim@st.com>2019-05-06 10:55:50 +0200
committerJack Yu <jackcwyu@google.com>2019-05-08 14:17:23 +0000
commit03c3d9be0095fbf834bf760c7035e4f551f821d9 (patch)
treedf150986c77c5264c12eb79f027a23f5c36077df
parentdfb81f8e6ae60fea845d3962d3e9956f5605394b (diff)
downloadSecureElement-03c3d9be0095fbf834bf760c7035e4f551f821d9.tar.gz
Initialize SEHAL 1.1 after initializing mSEHal variable.android10-dev
Keep the same order than SEHAL 1.0. There is possibility to use mSEHal before initialized. Bug: 131298247 Test: AccessRule loaded successfully Change-Id: I65c0fe98c4cafd179be3708e53b6d40165acd9f6 Merged-In: I65c0fe98c4cafd179be3708e53b6d40165acd9f6
-rw-r--r--src/com/android/se/Terminal.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/se/Terminal.java b/src/com/android/se/Terminal.java
index 9220fbf..e17ac88 100644
--- a/src/com/android/se/Terminal.java
+++ b/src/com/android/se/Terminal.java
@@ -202,8 +202,8 @@ public class Terminal {
}
}
if (seHal11 != null) {
- seHal11.init_1_1(mHalCallback11);
mSEHal = seHal11;
+ seHal11.init_1_1(mHalCallback11);
} else {
mSEHal.init(mHalCallback);
}