diff options
| author | Xin Li <delphij@google.com> | 2020-09-08 16:56:07 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-09-08 16:56:07 -0700 |
| commit | 8d017fe0b98c0dda314f5425a1aa808b8512461a (patch) | |
| tree | ef7ba88cb14f02bea02a926695e7f2000fd3b004 | |
| parent | 406aec1da7f9b298d5f18076d77c511adc4fc5cd (diff) | |
| parent | 6a7763d5a2e5246cd518ece0288292b7406f104c (diff) | |
| download | SecureElement-8d017fe0b98c0dda314f5425a1aa808b8512461a.tar.gz | |
Merge Android R
Bug: 168057903
Merged-In: I0c95c223bdf1983a328859775a77bde95d3c10bd
Change-Id: I21f8a07ee72dd25dff914c1a89765444495715a7
| -rw-r--r-- | Android.bp | 13 | ||||
| -rw-r--r-- | src/com/android/se/Terminal.java | 37 |
2 files changed, 30 insertions, 20 deletions
@@ -1,6 +1,17 @@ +genrule { + name: "statslog-secure-element-java-gen", + tools: ["stats-log-api-gen"], + cmd: "$(location stats-log-api-gen) --java $(out) --module secure_element" + + " --javaPackage com.android.se --javaClass SecureElementStatsLog", + out: ["com/android/se/SecureElementStatsLog.java"], +} + android_app { name: "SecureElement", - srcs: ["src/**/*.java"], + srcs: [ + "src/**/*.java", + ":statslog-secure-element-java-gen", + ], platform_apis: true, certificate: "platform", static_libs: ["android.hardware.secure_element-V1.0-java", diff --git a/src/com/android/se/Terminal.java b/src/com/android/se/Terminal.java index bd4c96e..8cff518 100644 --- a/src/com/android/se/Terminal.java +++ b/src/com/android/se/Terminal.java @@ -42,7 +42,6 @@ import android.se.omapi.ISecureElementReader; import android.se.omapi.ISecureElementSession; import android.se.omapi.SEService; import android.util.Log; -import android.util.StatsLog; import com.android.se.SecureElementService.SecureElementSession; import com.android.se.internal.ByteArrayConverter; @@ -136,9 +135,9 @@ public class Terminal { if (mAccessControlEnforcer != null) { mAccessControlEnforcer.reset(); } - StatsLog.write( - StatsLog.SE_STATE_CHANGED, - StatsLog.SE_STATE_CHANGED__STATE__DISCONNECTED, + SecureElementStatsLog.write( + SecureElementStatsLog.SE_STATE_CHANGED, + SecureElementStatsLog.SE_STATE_CHANGED__STATE__DISCONNECTED, reason, mName); } else { @@ -153,9 +152,9 @@ public class Terminal { // ignore } mDefaultApplicationSelectedOnBasicChannel = true; - StatsLog.write( - StatsLog.SE_STATE_CHANGED, - StatsLog.SE_STATE_CHANGED__STATE__CONNECTED, + SecureElementStatsLog.write( + SecureElementStatsLog.SE_STATE_CHANGED, + SecureElementStatsLog.SE_STATE_CHANGED__STATE__CONNECTED, reason, mName); } @@ -166,9 +165,9 @@ public class Terminal { @Override public void serviceDied(long cookie) { Log.e(mTag, mName + " died"); - StatsLog.write( - StatsLog.SE_STATE_CHANGED, - StatsLog.SE_STATE_CHANGED__STATE__HALCRASH, + SecureElementStatsLog.write( + SecureElementStatsLog.SE_STATE_CHANGED, + SecureElementStatsLog.SE_STATE_CHANGED__STATE__HALCRASH, "HALCRASH", mName); synchronized (mLock) { @@ -258,9 +257,9 @@ public class Terminal { mSEHal.linkToDeath(mDeathRecipient, 0); } Log.i(mTag, mName + " was initialized"); - StatsLog.write( - StatsLog.SE_STATE_CHANGED, - StatsLog.SE_STATE_CHANGED__STATE__INITIALIZED, + SecureElementStatsLog.write( + SecureElementStatsLog.SE_STATE_CHANGED, + SecureElementStatsLog.SE_STATE_CHANGED__STATE__INITIALIZED, "INIT", mName); } @@ -436,9 +435,9 @@ public class Terminal { ChannelAccess channelAccess = null; if (packageName != null) { Log.w(mTag, "Enable access control on basic channel for " + packageName); - StatsLog.write( - StatsLog.SE_OMAPI_REPORTED, - StatsLog.SE_OMAPI_REPORTED__OPERATION__OPEN_CHANNEL, + SecureElementStatsLog.write( + SecureElementStatsLog.SE_OMAPI_REPORTED, + SecureElementStatsLog.SE_OMAPI_REPORTED__OPERATION__OPEN_CHANNEL, mName, packageName); try { @@ -525,9 +524,9 @@ public class Terminal { ChannelAccess channelAccess = null; if (packageName != null) { Log.w(mTag, "Enable access control on logical channel for " + packageName); - StatsLog.write( - StatsLog.SE_OMAPI_REPORTED, - StatsLog.SE_OMAPI_REPORTED__OPERATION__OPEN_CHANNEL, + SecureElementStatsLog.write( + SecureElementStatsLog.SE_OMAPI_REPORTED, + SecureElementStatsLog.SE_OMAPI_REPORTED__OPERATION__OPEN_CHANNEL, mName, packageName); try { |