Migrate to NfcStatsLog from StatsLog
As part of statsd becoming a Mainline module in R, autogenerated
StatsLog.write() calls are going away and being replaced by *StatsLog.java
that is autogenerated for each module.
This CL adds autogenerated NfcStatsLog and replaces usages
of StatsLog with NfcStatsLog.
Bug: 145952197
Test: m NfcNci
Change-Id: I98af80d4047a02393b95f6c7e39de960a5645480
diff --git a/Android.bp b/Android.bp
index 183309a..8c68554 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,9 +1,18 @@
+genrule {
+ name: "statslog-Nfc-java-gen",
+ tools: ["stats-log-api-gen"],
+ cmd: "$(location stats-log-api-gen) --java $(out) --module nfc --javaPackage com.android.nfc"
+ + " --javaClass NfcStatsLog",
+ out: ["com/android/nfc/NfcStatsLog.java"],
+}
+
// NCI Configuration
android_app {
name: "NfcNci",
srcs: [
"src/**/*.java",
"nci/**/*.java",
+ ":statslog-Nfc-java-gen",
],
platform_apis: true,
certificate: "platform",
diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java
index dafaac8..d485ef6 100644
--- a/src/com/android/nfc/NfcDispatcher.java
+++ b/src/com/android/nfc/NfcDispatcher.java
@@ -70,7 +70,6 @@
import java.util.List;
import java.util.Locale;
-import android.util.StatsLog;
/**
* Dispatch of NFC events to start activities
*/
@@ -241,7 +240,8 @@
ActivityManager.getCurrentUser());
if (activities.size() > 0) {
context.startActivityAsUser(rootIntent, UserHandle.CURRENT);
- StatsLog.write(StatsLog.NFC_TAG_OCCURRED, StatsLog.NFC_TAG_OCCURRED__TYPE__APP_LAUNCH);
+ NfcStatsLog.write(NfcStatsLog.NFC_TAG_OCCURRED,
+ NfcStatsLog.NFC_TAG_OCCURRED__TYPE__APP_LAUNCH);
return true;
}
return false;
@@ -253,7 +253,8 @@
if (activities.size() > 0) {
rootIntent.putExtra(NfcRootActivity.EXTRA_LAUNCH_INTENT, intentToStart);
context.startActivityAsUser(rootIntent, UserHandle.CURRENT);
- StatsLog.write(StatsLog.NFC_TAG_OCCURRED, StatsLog.NFC_TAG_OCCURRED__TYPE__APP_LAUNCH);
+ NfcStatsLog.write(NfcStatsLog.NFC_TAG_OCCURRED,
+ NfcStatsLog.NFC_TAG_OCCURRED__TYPE__APP_LAUNCH);
return true;
}
return false;
@@ -309,24 +310,28 @@
if (tryOverrides(dispatch, tag, message, overrideIntent, overrideFilters,
overrideTechLists)) {
- StatsLog.write(StatsLog.NFC_TAG_OCCURRED, StatsLog.NFC_TAG_OCCURRED__TYPE__APP_LAUNCH);
+ NfcStatsLog.write(
+ NfcStatsLog.NFC_TAG_OCCURRED, NfcStatsLog.NFC_TAG_OCCURRED__TYPE__APP_LAUNCH);
return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS;
}
if (tryPeripheralHandover(message)) {
if (DBG) Log.i(TAG, "matched BT HANDOVER");
- StatsLog.write(StatsLog.NFC_TAG_OCCURRED, StatsLog.NFC_TAG_OCCURRED__TYPE__BT_PAIRING);
+ NfcStatsLog.write(
+ NfcStatsLog.NFC_TAG_OCCURRED, NfcStatsLog.NFC_TAG_OCCURRED__TYPE__BT_PAIRING);
return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS;
}
if (NfcWifiProtectedSetup.tryNfcWifiSetup(ndef, mContext)) {
if (DBG) Log.i(TAG, "matched NFC WPS TOKEN");
- StatsLog.write(StatsLog.NFC_TAG_OCCURRED, StatsLog.NFC_TAG_OCCURRED__TYPE__WIFI_CONNECT);
+ NfcStatsLog.write(
+ NfcStatsLog.NFC_TAG_OCCURRED, NfcStatsLog.NFC_TAG_OCCURRED__TYPE__WIFI_CONNECT);
return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS;
}
if (provisioningOnly) {
- StatsLog.write(StatsLog.NFC_TAG_OCCURRED, StatsLog.NFC_TAG_OCCURRED__TYPE__PROVISION);
+ NfcStatsLog.write(
+ NfcStatsLog.NFC_TAG_OCCURRED, NfcStatsLog.NFC_TAG_OCCURRED__TYPE__PROVISION);
if (message == null) {
// We only allow NDEF-message dispatch in provisioning mode
return DISPATCH_FAIL;
@@ -361,7 +366,7 @@
}
if (DBG) Log.i(TAG, "no match");
- StatsLog.write(StatsLog.NFC_TAG_OCCURRED, StatsLog.NFC_TAG_OCCURRED__TYPE__OTHERS);
+ NfcStatsLog.write(NfcStatsLog.NFC_TAG_OCCURRED, NfcStatsLog.NFC_TAG_OCCURRED__TYPE__OTHERS);
return DISPATCH_FAIL;
}
@@ -562,7 +567,8 @@
if (dispatch.isWebIntent() && dispatch.hasIntentReceiver()) {
if (DBG) Log.i(TAG, "matched Web link - prompting user");
showWebLinkConfirmation(dispatch);
- StatsLog.write(StatsLog.NFC_TAG_OCCURRED, StatsLog.NFC_TAG_OCCURRED__TYPE__URL);
+ NfcStatsLog.write(
+ NfcStatsLog.NFC_TAG_OCCURRED, NfcStatsLog.NFC_TAG_OCCURRED__TYPE__URL);
return true;
}
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 601e867..a906c09 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -113,8 +113,6 @@
import java.util.NoSuchElementException;
import java.util.Scanner;
-import android.util.StatsLog;
-
public class NfcService implements DeviceHostListener {
static final boolean DBG = false;
static final String TAG = "NfcService";
@@ -387,7 +385,8 @@
public void onNfcTransactionEvent(byte[] aid, byte[] data, String seName) {
byte[][] dataObj = {aid, data, seName.getBytes()};
sendMessage(NfcService.MSG_TRANSACTION_EVENT, dataObj);
- StatsLog.write(StatsLog.NFC_CARDEMULATION_OCCURRED, StatsLog.NFC_CARDEMULATION_OCCURRED__CATEGORY__OFFHOST, seName);
+ NfcStatsLog.write(NfcStatsLog.NFC_CARDEMULATION_OCCURRED,
+ NfcStatsLog.NFC_CARDEMULATION_OCCURRED__CATEGORY__OFFHOST, seName);
}
@Override
@@ -679,7 +678,8 @@
return true;
}
Log.i(TAG, "Enabling NFC");
- StatsLog.write(StatsLog.NFC_STATE_CHANGED, StatsLog.NFC_STATE_CHANGED__STATE__ON);
+ NfcStatsLog.write(
+ NfcStatsLog.NFC_STATE_CHANGED, NfcStatsLog.NFC_STATE_CHANGED__STATE__ON);
updateState(NfcAdapter.STATE_TURNING_ON);
WatchDogThread watchDog = new WatchDogThread("enableInternal", INIT_WATCHDOG_MS);
@@ -743,7 +743,8 @@
return true;
}
Log.i(TAG, "Disabling NFC");
- StatsLog.write(StatsLog.NFC_STATE_CHANGED, StatsLog.NFC_STATE_CHANGED__STATE__OFF);
+ NfcStatsLog.write(
+ NfcStatsLog.NFC_STATE_CHANGED, NfcStatsLog.NFC_STATE_CHANGED__STATE__OFF);
updateState(NfcAdapter.STATE_TURNING_OFF);
/* Sometimes mDeviceHost.deinitialize() hangs, use a watch-dog.
@@ -978,9 +979,11 @@
mCardEmulationManager.onSecureNfcToggled();
}
if (enable)
- StatsLog.write(StatsLog.NFC_STATE_CHANGED, StatsLog.NFC_STATE_CHANGED__STATE__ON_LOCKED);
+ NfcStatsLog.write(NfcStatsLog.NFC_STATE_CHANGED,
+ NfcStatsLog.NFC_STATE_CHANGED__STATE__ON_LOCKED);
else
- StatsLog.write(StatsLog.NFC_STATE_CHANGED, StatsLog.NFC_STATE_CHANGED__STATE__ON);
+ NfcStatsLog.write(
+ NfcStatsLog.NFC_STATE_CHANGED, NfcStatsLog.NFC_STATE_CHANGED__STATE__ON);
return true;
}
@@ -1760,7 +1763,8 @@
mRoutingWakeLock.release();
}
Log.e(TAG, "Watchdog triggered, aborting.");
- StatsLog.write(StatsLog.NFC_STATE_CHANGED, StatsLog.NFC_STATE_CHANGED__STATE__CRASH_RESTART);
+ NfcStatsLog.write(NfcStatsLog.NFC_STATE_CHANGED,
+ NfcStatsLog.NFC_STATE_CHANGED__STATE__CRASH_RESTART);
storeNativeCrashLogs();
mDeviceHost.doAbort(getName());
}
diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java
index ae818a3..5754374 100755
--- a/src/com/android/nfc/P2pLinkManager.java
+++ b/src/com/android/nfc/P2pLinkManager.java
@@ -61,7 +61,6 @@
import java.util.List;
import java.io.UnsupportedEncodingException;
-import android.util.StatsLog;
/**
* Interface to listen for P2P events.
* All callbacks are made from the UI thread.
@@ -1108,7 +1107,8 @@
mSendState = SEND_STATE_NOTHING_TO_SEND;
if (DBG) Log.d(TAG, "onP2pReceiveComplete()");
mEventListener.onP2pReceiveComplete(false);
- StatsLog.write(StatsLog.NFC_BEAM_OCCURRED, StatsLog.NFC_BEAM_OCCURRED__OPERATION__RECEIVE);
+ NfcStatsLog.write(NfcStatsLog.NFC_BEAM_OCCURRED,
+ NfcStatsLog.NFC_BEAM_OCCURRED__OPERATION__RECEIVE);
}
break;
case MSG_RECEIVE_COMPLETE:
@@ -1124,7 +1124,8 @@
if (DBG) Log.d(TAG, "onP2pReceiveComplete()");
mEventListener.onP2pReceiveComplete(true);
NfcService.getInstance().sendMockNdefTag(m);
- StatsLog.write(StatsLog.NFC_BEAM_OCCURRED, StatsLog.NFC_BEAM_OCCURRED__OPERATION__RECEIVE);
+ NfcStatsLog.write(NfcStatsLog.NFC_BEAM_OCCURRED,
+ NfcStatsLog.NFC_BEAM_OCCURRED__OPERATION__RECEIVE);
}
break;
case MSG_HANDOVER_NOT_SUPPORTED:
@@ -1157,7 +1158,8 @@
Log.e(TAG, "Failed NDEF completed callback: " + e.getMessage());
}
}
- StatsLog.write(StatsLog.NFC_BEAM_OCCURRED, StatsLog.NFC_BEAM_OCCURRED__OPERATION__SEND);
+ NfcStatsLog.write(NfcStatsLog.NFC_BEAM_OCCURRED,
+ NfcStatsLog.NFC_BEAM_OCCURRED__OPERATION__SEND);
}
break;
case MSG_HANDOVER_BUSY:
diff --git a/src/com/android/nfc/cardemulation/AidRoutingManager.java b/src/com/android/nfc/cardemulation/AidRoutingManager.java
index e42a7fa..8dec603 100644
--- a/src/com/android/nfc/cardemulation/AidRoutingManager.java
+++ b/src/com/android/nfc/cardemulation/AidRoutingManager.java
@@ -17,20 +17,17 @@
import android.util.Log;
import android.util.SparseArray;
-
import com.android.nfc.NfcService;
-
+import com.android.nfc.NfcStatsLog;
import java.io.FileDescriptor;
import java.io.PrintWriter;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import android.util.StatsLog;
-
public class AidRoutingManager {
static final String TAG = "AidRoutingManager";
@@ -360,7 +357,8 @@
if(aidRouteResolved == true) {
commit(aidRoutingTableCache);
} else {
- StatsLog.write(StatsLog.NFC_ERROR_OCCURRED, StatsLog.NFC_ERROR_OCCURRED__TYPE__AID_OVERFLOW, 0, 0);
+ NfcStatsLog.write(NfcStatsLog.NFC_ERROR_OCCURRED,
+ NfcStatsLog.NFC_ERROR_OCCURRED__TYPE__AID_OVERFLOW, 0, 0);
Log.e(TAG, "RoutingTable unchanged because it's full, not updating");
}
}
diff --git a/src/com/android/nfc/cardemulation/HostEmulationManager.java b/src/com/android/nfc/cardemulation/HostEmulationManager.java
index df701f2..e3f9c01 100644
--- a/src/com/android/nfc/cardemulation/HostEmulationManager.java
+++ b/src/com/android/nfc/cardemulation/HostEmulationManager.java
@@ -34,16 +34,13 @@
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.Log;
-
import com.android.nfc.NfcService;
+import com.android.nfc.NfcStatsLog;
import com.android.nfc.cardemulation.RegisteredAidCache.AidResolveInfo;
-
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
-import android.util.StatsLog;
-
public class HostEmulationManager {
static final String TAG = "HostEmulationManager";
static final boolean DBG = false;
@@ -225,12 +222,12 @@
mState = STATE_W4_SERVICE;
}
if(CardEmulation.CATEGORY_PAYMENT.equals(resolveInfo.category))
- StatsLog.write(StatsLog.NFC_CARDEMULATION_OCCURRED,
- StatsLog.NFC_CARDEMULATION_OCCURRED__CATEGORY__HCE_PAYMENT,
+ NfcStatsLog.write(NfcStatsLog.NFC_CARDEMULATION_OCCURRED,
+ NfcStatsLog.NFC_CARDEMULATION_OCCURRED__CATEGORY__HCE_PAYMENT,
"HCE");
else
- StatsLog.write(StatsLog.NFC_CARDEMULATION_OCCURRED,
- StatsLog.NFC_CARDEMULATION_OCCURRED__CATEGORY__HCE_OTHER,
+ NfcStatsLog.write(NfcStatsLog.NFC_CARDEMULATION_OCCURRED,
+ NfcStatsLog.NFC_CARDEMULATION_OCCURRED__CATEGORY__HCE_OTHER,
"HCE");
} else {
diff --git a/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java b/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java
index 1880a7a..fd51f18 100644
--- a/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java
+++ b/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java
@@ -20,8 +20,8 @@
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
-import android.nfc.cardemulation.NfcFServiceInfo;
import android.nfc.cardemulation.HostNfcFService;
+import android.nfc.cardemulation.NfcFServiceInfo;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
@@ -30,14 +30,11 @@
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.Log;
-
import com.android.nfc.NfcService;
-
+import com.android.nfc.NfcStatsLog;
import java.io.FileDescriptor;
import java.io.PrintWriter;
-import android.util.StatsLog;
-
public class HostNfcFEmulationManager {
static final String TAG = "HostNfcFEmulationManager";
static final boolean DBG = false;
@@ -135,8 +132,8 @@
mPendingPacket = data;
mState = STATE_W4_SERVICE;
}
- StatsLog.write(StatsLog.NFC_CARDEMULATION_OCCURRED,
- StatsLog.NFC_CARDEMULATION_OCCURRED__CATEGORY__HCE_PAYMENT,
+ NfcStatsLog.write(NfcStatsLog.NFC_CARDEMULATION_OCCURRED,
+ NfcStatsLog.NFC_CARDEMULATION_OCCURRED__CATEGORY__HCE_PAYMENT,
"HCEF");
break;
case STATE_W4_SERVICE:
