Merge "Rename "Westworld" to "Statsd"" into rvc-dev

6 files changed, 7 insertions, 7 deletions

diff --git a/service/java/com/android/server/wifi/WifiDataStall.java b/service/java/com/android/server/wifi/WifiDataStall.java
index 87b9a1b68..7ae577900 100644
--- a/service/java/com/android/server/wifi/WifiDataStall.java
+++ b/service/java/com/android/server/wifi/WifiDataStall.java
@@ -492,7 +492,7 @@ public class WifiDataStall {
     }
 
     /**
-     * Report the latest Wifi connection health to WestWorld
+     * Report the latest Wifi connection health to statsd
      */
     private void reportWifiHealthStat(int frequency, int timeDeltaLastTwoPollsMs,
             boolean isThroughputSufficient,
diff --git a/service/java/com/android/server/wifi/WifiHealthMonitor.java b/service/java/com/android/server/wifi/WifiHealthMonitor.java
index 8ab3a74a6..81076221b 100644
--- a/service/java/com/android/server/wifi/WifiHealthMonitor.java
+++ b/service/java/com/android/server/wifi/WifiHealthMonitor.java
@@ -375,7 +375,7 @@ public class WifiHealthMonitor {
         logd("#networks w/ sufficient recent stats: " + mNumNetworkSufficientRecentStatsOnly);
         logd("#networks w/ sufficient recent and prev stats: "
                 + mNumNetworkSufficientRecentPrevStats);
-        // Write metrics to WestWorld
+        // Write metrics to statsd
         writeToWifiStatsLog();
         doWrites();
         mWifiScoreCard.doWrites();
diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java
index a704f10da..14dd86f84 100644
--- a/service/java/com/android/server/wifi/WifiMetrics.java
+++ b/service/java/com/android/server/wifi/WifiMetrics.java
@@ -1590,7 +1590,7 @@ public class WifiMetrics {
                         connectivityFailureCode;
                 mCurrentConnectionEvent.mConnectionEvent.level2FailureReason = level2FailureReason;
 
-                // Write metrics to WestWorld
+                // Write metrics to statsd
                 int wwFailureCode = getConnectionResultFailureCode(level2FailureCode,
                         level2FailureReason);
                 if (wwFailureCode != -1) {
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java
index e374a9080..61979f1e8 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java
@@ -535,7 +535,7 @@ public class WifiDataStallTest extends WifiBaseTest {
     }
 
     /**
-     * Check WestWorld logging
+     * Check statsd logging
      */
     @Test
     public void testWifiStatsLogWrite() throws Exception {
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiHealthMonitorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiHealthMonitorTest.java
index 264fe9048..12796510e 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiHealthMonitorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiHealthMonitorTest.java
@@ -541,7 +541,7 @@ public class WifiHealthMonitorTest extends WifiBaseTest {
     }
 
     /**
-     * Check WestWorld logging after one daily detection with high non-local disconnection rate
+     * Check statsd logging after one daily detection with high non-local disconnection rate
      */
     @Test
     public void testWifiStatsLogWrite() throws Exception {
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
index ca5ae268d..198eb079f 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
@@ -1947,10 +1947,10 @@ public class WifiMetricsTest extends WifiBaseTest {
     }
 
     /**
-     * Test logging to WestWorld when a connection event finishes.
+     * Test logging to statsd when a connection event finishes.
      */
     @Test
-    public void testLogWifiConnectionResultWestworld() throws Exception {
+    public void testLogWifiConnectionResultStatsd() throws Exception {
         // static mocking for WifiStatsLog
         mSession = ExtendedMockito.mockitoSession()
                 .strictness(Strictness.LENIENT)