commit | 03c3d9be0095fbf834bf760c7035e4f551f821d9 | [log] [tgz] |
---|---|---|
author | Arach MOHAMMED BRAHIM <arach.mohammed.brahim@st.com> | Mon May 06 10:55:50 2019 +0200 |
committer | Jack Yu <jackcwyu@google.com> | Wed May 08 14:17:23 2019 +0000 |
tree | df150986c77c5264c12eb79f027a23f5c36077df | |
parent | dfb81f8e6ae60fea845d3962d3e9956f5605394b [diff] |
Initialize SEHAL 1.1 after initializing mSEHal variable. 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
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 @@ } } if (seHal11 != null) { - seHal11.init_1_1(mHalCallback11); mSEHal = seHal11; + seHal11.init_1_1(mHalCallback11); } else { mSEHal.init(mHalCallback); }