commit c976c4366c47a56ff463a5158fe1eafd9bb11b2e
author Yan Wang <yawanng@google.com> Tue Mar 31 13:52:20 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 01 21:10:53 2020 +0000
tree 440e213d57ff896df7525b262d5980152a3af2a5
parent e781cc43c6d4aa190d68c5405f36770ba9d6fd0b

startop: Fix a string format bug in EventSequenceValidator.

Bug: 152725990
Test: Make and run check the log.
Change-Id: Ib56a8f7acadec073946353f8b0a8a4677099b3b2
(cherry picked from commit b5d1353a6998e97aa4f5250a359fc2589b4af34c)

startop/iorap/src/com/google/android/startop/iorap/EventSequenceValidator.java

diff --git a/startop/iorap/src/com/google/android/startop/iorap/EventSequenceValidator.java b/startop/iorap/src/com/google/android/startop/iorap/EventSequenceValidator.java
index 47bf148..6b19455 100644
--- a/startop/iorap/src/com/google/android/startop/iorap/EventSequenceValidator.java
+++ b/startop/iorap/src/com/google/android/startop/iorap/EventSequenceValidator.java
@@ -103,8 +103,7 @@
   @Override
   public void onIntentStarted(@NonNull Intent intent, long timestampNs) {
     if (state == State.UNKNOWN) {
-      logWarningWithStackTrace(
-          String.format("IntentStarted during UNKNOWN. " + intent));
+      logWarningWithStackTrace("IntentStarted during UNKNOWN. " + intent);
       incAccIntentStartedEvents();
       return;
     }
@@ -128,7 +127,7 @@
   @Override
   public void onIntentFailed() {
     if (state == State.UNKNOWN) {
-      logWarningWithStackTrace(String.format("onIntentFailed during UNKNOWN."));
+      logWarningWithStackTrace("onIntentFailed during UNKNOWN.");
       decAccIntentStartedEvents();
       return;
     }
@@ -147,8 +146,7 @@
   public void onActivityLaunched(@NonNull @ActivityRecordProto byte[] activity,
       @Temperature int temperature) {
     if (state == State.UNKNOWN) {
-      logWarningWithStackTrace(
-          String.format("onActivityLaunched during UNKNOWN."));
+      logWarningWithStackTrace("onActivityLaunched during UNKNOWN.");
       return;
     }
     if (state != State.INTENT_STARTED) {
@@ -165,8 +163,7 @@
   @Override
   public void onActivityLaunchCancelled(@Nullable @ActivityRecordProto byte[] activity) {
     if (state == State.UNKNOWN) {
-      logWarningWithStackTrace(
-          String.format("onActivityLaunchCancelled during UNKNOWN."));
+      logWarningWithStackTrace("onActivityLaunchCancelled during UNKNOWN.");
       decAccIntentStartedEvents();
       return;
     }
@@ -185,8 +182,7 @@
   public void onActivityLaunchFinished(@NonNull @ActivityRecordProto byte[] activity,
       long timestampNs) {
     if (state == State.UNKNOWN) {
-      logWarningWithStackTrace(
-          String.format("onActivityLaunchFinished during UNKNOWN."));
+      logWarningWithStackTrace("onActivityLaunchFinished during UNKNOWN.");
       decAccIntentStartedEvents();
       return;
     }
@@ -206,8 +202,7 @@
   public void onReportFullyDrawn(@NonNull @ActivityRecordProto byte[] activity,
       long timestampNs) {
     if (state == State.UNKNOWN) {
-      logWarningWithStackTrace(
-          String.format("onReportFullyDrawn during UNKNOWN."));
+      logWarningWithStackTrace("onReportFullyDrawn during UNKNOWN.");
       return;
     }
     if (state == State.INIT) {
@@ -237,8 +232,7 @@
 
   private void incAccIntentStartedEvents() {
     if (accIntentStartedEvents < 0) {
-      throw new AssertionError(
-          String.format("The number of unknowns cannot be negative"));
+      throw new AssertionError("The number of unknowns cannot be negative");
     }
     if (accIntentStartedEvents == 0) {
       state = State.UNKNOWN;
@@ -250,8 +244,7 @@
 
   private void decAccIntentStartedEvents() {
     if (accIntentStartedEvents <= 0) {
-      throw new AssertionError(
-          String.format("The number of unknowns cannot be negative"));
+      throw new AssertionError("The number of unknowns cannot be negative");
     }
     if(accIntentStartedEvents == 1) {
       state = State.INIT;