Rename VmsClientLog to VmsClientLogger.
Also makes some minor comment changes.
Bug: 141697665
Test: atest AndroidCarApiTest CarServiceTest CarServiceUnitTest
Change-Id: I24c4870d5d812069b2ad87b21a68f1bd224443fb
(cherry picked from commit c98f995de0b638c56f804f36e5ef9e0b164177e6)
diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index d2fed46..0c50da9 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -494,6 +494,7 @@
}
} else if ("--metrics".equals(args[0])) {
// Strip the --metrics flag when passing dumpsys arguments to CarStatsService
+ // allowing for nested flag selection
mCarStatsService.dump(fd, writer, Arrays.copyOfRange(args, 1, args.length));
} else if ("--vms-hal".equals(args[0])) {
mHal.getVmsHal().dumpMetrics(fd);
diff --git a/service/src/com/android/car/VmsPublisherService.java b/service/src/com/android/car/VmsPublisherService.java
index da0b8b7..def10dd 100644
--- a/service/src/com/android/car/VmsPublisherService.java
+++ b/service/src/com/android/car/VmsPublisherService.java
@@ -181,7 +181,7 @@
}
int payloadLength = payload != null ? payload.length : 0;
- mStatsService.getVmsClientLog(mGetCallingUid.getAsInt())
+ mStatsService.getVmsClientLogger(mGetCallingUid.getAsInt())
.logPacketSent(layer, payloadLength);
// Send the message to subscribers
@@ -192,7 +192,7 @@
if (listeners.size() == 0) {
// A negative UID signals that the packet had zero subscribers
- mStatsService.getVmsClientLog(-1)
+ mStatsService.getVmsClientLogger(-1)
.logPacketDropped(layer, payloadLength);
}
@@ -200,10 +200,10 @@
int subscriberUid = mClientManager.getSubscriberUid(listener);
try {
listener.onVmsMessageReceived(layer, payload);
- mStatsService.getVmsClientLog(subscriberUid)
+ mStatsService.getVmsClientLogger(subscriberUid)
.logPacketReceived(layer, payloadLength);
} catch (RemoteException ex) {
- mStatsService.getVmsClientLog(subscriberUid)
+ mStatsService.getVmsClientLogger(subscriberUid)
.logPacketDropped(layer, payloadLength);
String subscriberName = mClientManager.getPackageName(listener);
Log.e(TAG, String.format("Unable to publish to listener: %s", subscriberName));
diff --git a/service/src/com/android/car/stats/CarStatsService.java b/service/src/com/android/car/stats/CarStatsService.java
index 64fbf1f..d74fb8c 100644
--- a/service/src/com/android/car/stats/CarStatsService.java
+++ b/service/src/com/android/car/stats/CarStatsService.java
@@ -25,7 +25,7 @@
import android.util.Log;
import android.util.StatsLog;
-import com.android.car.stats.VmsClientLog.ConnectionState;
+import com.android.car.stats.VmsClientLogger.ConnectionState;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.car.ICarStatsService;
@@ -51,7 +51,7 @@
private static final String VMS_CONNECTION_STATS_DUMPSYS_HEADER =
"uid,packageName,attempts,connected,disconnected,terminated,errors";
- private static final Function<VmsClientLog, String> VMS_CONNECTION_STATS_DUMPSYS_FORMAT =
+ private static final Function<VmsClientLogger, String> VMS_CONNECTION_STATS_DUMPSYS_FORMAT =
entry -> String.format(Locale.US,
"%d,%s,%d,%d,%d,%d,%d",
entry.getUid(), entry.getPackageName(),
@@ -84,7 +84,7 @@
private final PackageManager mPackageManager;
@GuardedBy("mVmsClientStats")
- private final Map<Integer, VmsClientLog> mVmsClientStats = new ArrayMap<>();
+ private final Map<Integer, VmsClientLogger> mVmsClientStats = new ArrayMap<>();
public CarStatsService(Context context) {
mContext = context;
@@ -94,7 +94,7 @@
/**
* Gets a logger for the VMS client with a given UID.
*/
- public VmsClientLog getVmsClientLog(int clientUid) {
+ public VmsClientLogger getVmsClientLogger(int clientUid) {
synchronized (mVmsClientStats) {
return mVmsClientStats.computeIfAbsent(
clientUid,
@@ -103,7 +103,7 @@
if (DEBUG) {
Log.d(TAG, "Created VmsClientLog: " + packageName);
}
- return new VmsClientLog(uid, packageName);
+ return new VmsClientLogger(uid, packageName);
});
}
}
@@ -138,7 +138,7 @@
// Unknown UID will not have connection stats
.filter(entry -> entry.getUid() > 0)
// Sort stats by UID
- .sorted(Comparator.comparingInt(VmsClientLog::getUid))
+ .sorted(Comparator.comparingInt(VmsClientLogger::getUid))
.forEachOrdered(entry -> writer.println(
VMS_CONNECTION_STATS_DUMPSYS_FORMAT.apply(entry)));
writer.println();
diff --git a/service/src/com/android/car/stats/VmsClientLog.java b/service/src/com/android/car/stats/VmsClientLogger.java
similarity index 97%
rename from service/src/com/android/car/stats/VmsClientLog.java
rename to service/src/com/android/car/stats/VmsClientLogger.java
index 0fa2198..948db05 100644
--- a/service/src/com/android/car/stats/VmsClientLog.java
+++ b/service/src/com/android/car/stats/VmsClientLogger.java
@@ -31,7 +31,7 @@
/**
* Logger for per-client VMS statistics.
*/
-public class VmsClientLog {
+public class VmsClientLogger {
/**
* Constants used for identifying client connection states.
*/
@@ -64,7 +64,7 @@
@GuardedBy("mLock")
private final Map<VmsLayer, VmsClientStats> mLayerStats = new ArrayMap<>();
- VmsClientLog(int clientUid, @Nullable String clientPackage) {
+ VmsClientLogger(int clientUid, @Nullable String clientPackage) {
mUid = clientUid;
mPackageName = clientPackage != null ? clientPackage : "";
}
diff --git a/service/src/com/android/car/stats/VmsClientStats.java b/service/src/com/android/car/stats/VmsClientStats.java
index f4ce7b8..9fbe1dd 100644
--- a/service/src/com/android/car/stats/VmsClientStats.java
+++ b/service/src/com/android/car/stats/VmsClientStats.java
@@ -56,15 +56,15 @@
* @param layer Vehicle Maps Service layer.
*/
VmsClientStats(int uid, VmsLayer layer) {
- this.mUid = uid;
+ mUid = uid;
- this.mLayerType = layer.getType();
- this.mLayerChannel = layer.getSubtype();
- this.mLayerVersion = layer.getVersion();
+ mLayerType = layer.getType();
+ mLayerChannel = layer.getSubtype();
+ mLayerVersion = layer.getVersion();
}
/**
- * Copy constructor for entries exported from {@link VmsClientLog} to {@link CarStatsService}.
+ * Copy constructor for entries exported from {@link VmsClientLogger}.
*/
VmsClientStats(VmsClientStats other) {
synchronized (other.mLock) {
diff --git a/service/src/com/android/car/vms/VmsClientManager.java b/service/src/com/android/car/vms/VmsClientManager.java
index 346c730..cfadea3 100644
--- a/service/src/com/android/car/vms/VmsClientManager.java
+++ b/service/src/com/android/car/vms/VmsClientManager.java
@@ -41,8 +41,8 @@
import com.android.car.VmsPublisherService;
import com.android.car.hal.VmsHalService;
import com.android.car.stats.CarStatsService;
-import com.android.car.stats.VmsClientLog;
-import com.android.car.stats.VmsClientLog.ConnectionState;
+import com.android.car.stats.VmsClientLogger;
+import com.android.car.stats.VmsClientLogger.ConnectionState;
import com.android.car.user.CarUserService;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
@@ -311,7 +311,7 @@
new SubscriberConnection(subscriberClient, Process.myUid(), HAL_CLIENT_NAME,
UserHandle.USER_SYSTEM));
}
- mStatsService.getVmsClientLog(Process.myUid())
+ mStatsService.getVmsClientLogger(Process.myUid())
.logConnectionState(ConnectionState.CONNECTED);
}
@@ -322,7 +322,7 @@
synchronized (mLock) {
if (mHalClient != null) {
mPublisherService.onClientDisconnected(HAL_CLIENT_NAME);
- mStatsService.getVmsClientLog(Process.myUid())
+ mStatsService.getVmsClientLogger(Process.myUid())
.logConnectionState(ConnectionState.DISCONNECTED);
}
mHalClient = null;
@@ -405,7 +405,7 @@
return;
}
- VmsClientLog statsLog = mStatsService.getVmsClientLog(
+ VmsClientLogger statsLog = mStatsService.getVmsClientLogger(
UserHandle.getUid(userHandle.getIdentifier(), serviceInfo.applicationInfo.uid));
if (!Car.PERMISSION_BIND_VMS_CLIENT.equals(serviceInfo.permission)) {
@@ -433,13 +433,13 @@
private final ComponentName mName;
private final UserHandle mUser;
private final String mFullName;
- private final VmsClientLog mStatsLog;
+ private final VmsClientLogger mStatsLog;
private boolean mIsBound = false;
private boolean mIsTerminated = false;
private boolean mRebindScheduled = false;
private IVmsPublisherClient mClientService;
- PublisherConnection(ComponentName name, UserHandle user, VmsClientLog statsLog) {
+ PublisherConnection(ComponentName name, UserHandle user, VmsClientLogger statsLog) {
mName = name;
mUser = user;
mFullName = mName.flattenToString() + " U=" + mUser.getIdentifier();
diff --git a/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java b/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
index 2704654..2bd09df 100644
--- a/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
@@ -44,7 +44,7 @@
import androidx.test.filters.SmallTest;
import com.android.car.stats.CarStatsService;
-import com.android.car.stats.VmsClientLog;
+import com.android.car.stats.VmsClientLogger;
import com.android.car.vms.VmsBrokerService;
import com.android.car.vms.VmsClientManager;
@@ -92,13 +92,13 @@
private VmsClientManager mClientManager;
@Mock
- private VmsClientLog mPublisherLog;
+ private VmsClientLogger mPublisherLog;
@Mock
- private VmsClientLog mSubscriberLog;
+ private VmsClientLogger mSubscriberLog;
@Mock
- private VmsClientLog mSubscriberLog2;
+ private VmsClientLogger mSubscriberLog2;
@Mock
- private VmsClientLog mNoSubscribersLog;
+ private VmsClientLogger mNoSubscribersLog;
@Mock
private IVmsSubscriberClient mSubscriberClient;
@@ -118,10 +118,10 @@
when(mClientManager.getSubscriberUid(mSubscriberClient)).thenReturn(SUBSCRIBER_UID);
when(mClientManager.getSubscriberUid(mSubscriberClient2)).thenReturn(SUBSCRIBER_UID2);
- when(mStatsService.getVmsClientLog(PUBLISHER_UID)).thenReturn(mPublisherLog);
- when(mStatsService.getVmsClientLog(SUBSCRIBER_UID)).thenReturn(mSubscriberLog);
- when(mStatsService.getVmsClientLog(SUBSCRIBER_UID2)).thenReturn(mSubscriberLog2);
- when(mStatsService.getVmsClientLog(NO_SUBSCRIBERS_UID)).thenReturn(mNoSubscribersLog);
+ when(mStatsService.getVmsClientLogger(PUBLISHER_UID)).thenReturn(mPublisherLog);
+ when(mStatsService.getVmsClientLogger(SUBSCRIBER_UID)).thenReturn(mSubscriberLog);
+ when(mStatsService.getVmsClientLogger(SUBSCRIBER_UID2)).thenReturn(mSubscriberLog2);
+ when(mStatsService.getVmsClientLogger(NO_SUBSCRIBERS_UID)).thenReturn(mNoSubscribersLog);
mPublisherClient = new MockPublisherClient();
mPublisherClient2 = new MockPublisherClient();
diff --git a/tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java b/tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java
index a18c88f..9bdcaa6 100644
--- a/tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java
@@ -25,7 +25,7 @@
import androidx.test.filters.SmallTest;
-import com.android.car.stats.VmsClientLog.ConnectionState;
+import com.android.car.stats.VmsClientLogger.ConnectionState;
import org.junit.Before;
import org.junit.Rule;
@@ -84,66 +84,66 @@
@Test
public void testLogConnectionState_Connecting() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logConnectionState(ConnectionState.CONNECTING);
validateConnectionStats("10101,test.package,1,0,0,0,0");
}
@Test
public void testLogConnectionState_Connected() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logConnectionState(ConnectionState.CONNECTED);
validateConnectionStats("10101,test.package,0,1,0,0,0");
}
@Test
public void testLogConnectionState_Disconnected() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logConnectionState(ConnectionState.DISCONNECTED);
validateConnectionStats("10101,test.package,0,0,1,0,0");
}
@Test
public void testLogConnectionState_Terminated() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logConnectionState(ConnectionState.TERMINATED);
validateConnectionStats("10101,test.package,0,0,0,1,0");
}
@Test
public void testLogConnectionState_ConnectionError() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logConnectionState(ConnectionState.CONNECTION_ERROR);
validateConnectionStats("10101,test.package,0,0,0,0,1");
}
@Test
public void testLogConnectionState_UnknownUID() {
- mCarStatsService.getVmsClientLog(-1)
+ mCarStatsService.getVmsClientLogger(-1)
.logConnectionState(ConnectionState.CONNECTING);
testEmptyStats();
}
@Test
public void testLogConnectionState_MultipleClients_MultipleStates() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logConnectionState(ConnectionState.CONNECTING);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logConnectionState(ConnectionState.CONNECTED);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logConnectionState(ConnectionState.DISCONNECTED);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logConnectionState(ConnectionState.CONNECTED);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logConnectionState(ConnectionState.CONNECTING);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logConnectionState(ConnectionState.CONNECTED);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logConnectionState(ConnectionState.TERMINATED);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logConnectionState(ConnectionState.CONNECTING);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logConnectionState(ConnectionState.CONNECTION_ERROR);
validateConnectionStats(
"10101,test.package,1,2,1,0,0\n"
@@ -152,18 +152,18 @@
@Test
public void testLogPacketSent() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketSent(LAYER, 5);
validateClientStats("10101,1,2,3,5,1,0,0,0,0");
}
@Test
public void testLogPacketSent_MultiplePackets() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketSent(LAYER, 3);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketSent(LAYER, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketSent(LAYER, 1);
validateClientStats("10101,1,2,3,6,3,0,0,0,0");
@@ -171,11 +171,11 @@
@Test
public void testLogPacketSent_MultipleLayers() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketSent(LAYER, 3);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketSent(LAYER2, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketSent(LAYER3, 1);
validateClientStats(
@@ -186,11 +186,11 @@
@Test
public void testLogPacketSent_MultipleClients() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketSent(LAYER, 3);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logPacketSent(LAYER, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logPacketSent(LAYER2, 1);
validateDumpsys(
@@ -203,18 +203,18 @@
@Test
public void testLogPacketReceived() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketReceived(LAYER, 5);
validateClientStats("10101,1,2,3,0,0,5,1,0,0");
}
@Test
public void testLogPacketReceived_MultiplePackets() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketReceived(LAYER, 3);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketReceived(LAYER, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketReceived(LAYER, 1);
validateClientStats("10101,1,2,3,0,0,6,3,0,0");
@@ -222,11 +222,11 @@
@Test
public void testLogPacketReceived_MultipleLayers() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketReceived(LAYER, 3);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketReceived(LAYER2, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketReceived(LAYER3, 1);
validateClientStats(
@@ -237,11 +237,11 @@
@Test
public void testLogPacketReceived_MultipleClients() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketReceived(LAYER, 3);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logPacketReceived(LAYER, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logPacketReceived(LAYER2, 1);
validateDumpsys(
@@ -254,18 +254,18 @@
@Test
public void testLogPacketDropped() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketDropped(LAYER, 5);
validateClientStats("10101,1,2,3,0,0,0,0,5,1");
}
@Test
public void testLogPacketDropped_MultiplePackets() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketDropped(LAYER, 3);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketDropped(LAYER, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketDropped(LAYER, 1);
validateClientStats("10101,1,2,3,0,0,0,0,6,3");
@@ -273,11 +273,11 @@
@Test
public void testLogPacketDropped_MultipleLayers() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketDropped(LAYER, 3);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketDropped(LAYER2, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketDropped(LAYER3, 1);
validateClientStats(
@@ -288,11 +288,11 @@
@Test
public void testLogPacketDropped_MultipleClients() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketDropped(LAYER, 3);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logPacketDropped(LAYER, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logPacketDropped(LAYER2, 1);
validateDumpsys(
@@ -305,21 +305,21 @@
@Test
public void testLogPackets_MultipleClients_MultipleLayers_MultipleOperations() {
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketSent(LAYER, 3);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketReceived(LAYER, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID)
.logPacketDropped(LAYER, 1);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logPacketReceived(LAYER, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logPacketReceived(LAYER, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logPacketReceived(LAYER, 2);
- mCarStatsService.getVmsClientLog(CLIENT_UID2)
+ mCarStatsService.getVmsClientLogger(CLIENT_UID2)
.logPacketSent(LAYER2, 2);
- mCarStatsService.getVmsClientLog(-1)
+ mCarStatsService.getVmsClientLogger(-1)
.logPacketDropped(LAYER2, 12);
diff --git a/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java b/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java
index c7d6489..ec52fad 100644
--- a/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java
@@ -63,8 +63,8 @@
import com.android.car.VmsPublisherService;
import com.android.car.hal.VmsHalService;
import com.android.car.stats.CarStatsService;
-import com.android.car.stats.VmsClientLog;
-import com.android.car.stats.VmsClientLog.ConnectionState;
+import com.android.car.stats.VmsClientLogger;
+import com.android.car.stats.VmsClientLogger.ConnectionState;
import com.android.car.user.CarUserService;
import org.junit.After;
@@ -151,13 +151,13 @@
private ArgumentCaptor<ServiceConnection> mConnectionCaptor;
@Mock
- private VmsClientLog mSystemClientLog;
+ private VmsClientLogger mSystemClientLog;
@Mock
- private VmsClientLog mUserClientLog;
+ private VmsClientLogger mUserClientLog;
@Mock
- private VmsClientLog mUserClientLog2;
+ private VmsClientLogger mUserClientLog2;
@Mock
- private VmsClientLog mHalClientLog;
+ private VmsClientLogger mHalClientLog;
private VmsClientManager mClientManager;
@@ -176,7 +176,7 @@
mSystemServiceInfo.applicationInfo.uid = TEST_APP_ID;
when(mPackageManager.getServiceInfo(eq(SYSTEM_CLIENT_COMPONENT), anyInt()))
.thenReturn(mSystemServiceInfo);
- when(mStatsService.getVmsClientLog(TEST_SYSTEM_UID)).thenReturn(mSystemClientLog);
+ when(mStatsService.getVmsClientLogger(TEST_SYSTEM_UID)).thenReturn(mSystemClientLog);
mUserServiceInfo = new ServiceInfo();
mUserServiceInfo.permission = Car.PERMISSION_BIND_VMS_CLIENT;
@@ -184,10 +184,10 @@
mUserServiceInfo.applicationInfo.uid = TEST_APP_ID;
when(mPackageManager.getServiceInfo(eq(USER_CLIENT_COMPONENT), anyInt()))
.thenReturn(mUserServiceInfo);
- when(mStatsService.getVmsClientLog(TEST_USER_UID)).thenReturn(mUserClientLog);
- when(mStatsService.getVmsClientLog(TEST_USER_UID_U11)).thenReturn(mUserClientLog2);
+ when(mStatsService.getVmsClientLogger(TEST_USER_UID)).thenReturn(mUserClientLog);
+ when(mStatsService.getVmsClientLogger(TEST_USER_UID_U11)).thenReturn(mUserClientLog2);
- when(mStatsService.getVmsClientLog(Process.myUid())).thenReturn(mHalClientLog);
+ when(mStatsService.getVmsClientLogger(Process.myUid())).thenReturn(mHalClientLog);
when(mResources.getInteger(
com.android.car.R.integer.millisecondsBeforeRebindToVmsPublisher)).thenReturn(
