{11.0.0_r3}: Migrate to SecureElementStatsLog from StatsLog

As part of statsd becoming a Mainline module in R, autogenerated
StatsLog.write() calls are going away and replaced by *StatsLog.java
that is autogenerated for each module.
This CL adds autogenerated SecureElementStatsLog and replaces usages
of StatsLog with SecureElementStatsLog.

2 files changed, 30 insertions, 20 deletions

diff --git a/Android.bp b/Android.bp
index 603971e..96b7777 100755
--- a/Android.bp
+++ b/Android.bp
@@ -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 7eb47a2..d268da2 100755
--- a/src/com/android/se/Terminal.java
+++ b/src/com/android/se/Terminal.java
@@ -62,7 +62,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;
@@ -190,9 +189,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 {
@@ -207,9 +206,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);
              }
@@ -220,9 +219,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) {
@@ -324,9 +323,9 @@ public class Terminal {
         }
 
         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);
     }
@@ -502,9 +501,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 {
@@ -591,9 +590,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 {