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

core/java/com/android/internal/os/KernelCpuThreadReaderDiff.java

@@ -59,7 +59,7 @@ import java.util.Objects;
  * #getProcessCpuUsageDiffed()} result.
  *
  * <p>Thresholding is done in this class, instead of {@link KernelCpuThreadReader}, and instead of
- * WestWorld, because the thresholding should be done after diffing, not before. This is because of
+ * statsd, because the thresholding should be done after diffing, not before. This is because of
  * two issues with thresholding before diffing:
  *
  * <ul>

packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenGestureLogger.java

@@ -39,7 +39,7 @@ import javax.inject.Singleton;
 public class LockscreenGestureLogger {
 
     /**
-     * Contains Lockscreen related Westworld UiEvent enums.
+     * Contains Lockscreen related statsd UiEvent enums.
      */
     public enum LockscreenUiEvent implements UiEventLogger.UiEventEnum {
         @UiEvent(doc = "Lockscreen > Pull shade open")

packages/SystemUI/src/com/android/systemui/volume/Events.java

@@ -340,7 +340,7 @@ public class Events {
     }
 
     /**
-     * Logs an event to the event log and UiEvent (Westworld) logging. Compare writeEvent, which
+     * Logs an event to the event log and UiEvent (statsd) logging. Compare writeEvent, which
      * adds more log destinations.
      * @param tag One of the EVENT_* codes above.
      * @param list Any additional event-specific arguments, documented above.