s/FRAME_TYPE_FLAG/FRAME_TYPE/

FLAG is misleading because these are not bitwise masks, but
just identifiers of frame types.

Test: manual in KitchenSink
Change-Id: Ieed237ad6cb36bcec36c77d9a4ec5bc89edeaaba

2 files changed, 14 insertions, 14 deletions

diff --git a/car-lib/src/android/car/hardware/CarDiagnosticEvent.java b/car-lib/src/android/car/hardware/CarDiagnosticEvent.java
index 45f13ad082..1d825339b9 100644
--- a/car-lib/src/android/car/hardware/CarDiagnosticEvent.java
+++ b/car-lib/src/android/car/hardware/CarDiagnosticEvent.java
@@ -113,10 +113,10 @@ public class CarDiagnosticEvent implements Parcelable {
 
         jsonWriter.name("type");
         switch (frameType) {
-            case CarDiagnosticManager.FRAME_TYPE_FLAG_LIVE:
+            case CarDiagnosticManager.FRAME_TYPE_LIVE:
                 jsonWriter.value("live");
                 break;
-            case CarDiagnosticManager.FRAME_TYPE_FLAG_FREEZE:
+            case CarDiagnosticManager.FRAME_TYPE_FREEZE:
                 jsonWriter.value("freeze");
                 break;
             default:
@@ -175,7 +175,7 @@ public class CarDiagnosticEvent implements Parcelable {
     }
 
     public static class Builder {
-        private int mType = CarDiagnosticManager.FRAME_TYPE_FLAG_LIVE;
+        private int mType = CarDiagnosticManager.FRAME_TYPE_LIVE;
         private long mTimestamp = 0;
         private SparseArray<Float> mFloatValues = new SparseArray<>();
         private SparseIntArray mIntValues = new SparseIntArray();
@@ -186,11 +186,11 @@ public class CarDiagnosticEvent implements Parcelable {
         }
 
         public static Builder newLiveFrameBuilder() {
-            return new Builder(CarDiagnosticManager.FRAME_TYPE_FLAG_LIVE);
+            return new Builder(CarDiagnosticManager.FRAME_TYPE_LIVE);
         }
 
         public static Builder newFreezeFrameBuilder() {
-            return new Builder(CarDiagnosticManager.FRAME_TYPE_FLAG_FREEZE);
+            return new Builder(CarDiagnosticManager.FRAME_TYPE_FREEZE);
         }
 
         public Builder atTimestamp(long timestamp) {
@@ -242,11 +242,11 @@ public class CarDiagnosticEvent implements Parcelable {
     }
 
     public boolean isLiveFrame() {
-        return CarDiagnosticManager.FRAME_TYPE_FLAG_LIVE == frameType;
+        return CarDiagnosticManager.FRAME_TYPE_LIVE == frameType;
     }
 
     public boolean isFreezeFrame() {
-        return CarDiagnosticManager.FRAME_TYPE_FLAG_FREEZE == frameType;
+        return CarDiagnosticManager.FRAME_TYPE_FREEZE == frameType;
     }
 
     public boolean isEmptyFrame() {
diff --git a/car-lib/src/android/car/hardware/CarDiagnosticManager.java b/car-lib/src/android/car/hardware/CarDiagnosticManager.java
index b8643c6bed..851dd878d3 100644
--- a/car-lib/src/android/car/hardware/CarDiagnosticManager.java
+++ b/car-lib/src/android/car/hardware/CarDiagnosticManager.java
@@ -43,16 +43,16 @@ import java.util.function.Consumer;
 /** API for monitoring car diagnostic data. */
 /** @hide */
 public final class CarDiagnosticManager implements CarManagerBase {
-    public static final int FRAME_TYPE_FLAG_LIVE = 0;
-    public static final int FRAME_TYPE_FLAG_FREEZE = 1;
+    public static final int FRAME_TYPE_LIVE = 0;
+    public static final int FRAME_TYPE_FREEZE = 1;
 
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef({FRAME_TYPE_FLAG_LIVE, FRAME_TYPE_FLAG_FREEZE})
+    @IntDef({FRAME_TYPE_LIVE, FRAME_TYPE_FREEZE})
     public @interface FrameType {}
 
     public static final @FrameType int FRAME_TYPES[] = {
-        FRAME_TYPE_FLAG_LIVE,
-        FRAME_TYPE_FLAG_FREEZE
+        FRAME_TYPE_LIVE,
+        FRAME_TYPE_FREEZE
     };
 
     private static final int MSG_DIAGNOSTIC_EVENTS = 0;
@@ -107,8 +107,8 @@ public final class CarDiagnosticManager implements CarManagerBase {
 
     private void assertFrameType(@FrameType int frameType) {
         switch(frameType) {
-            case FRAME_TYPE_FLAG_FREEZE:
-            case FRAME_TYPE_FLAG_LIVE:
+            case FRAME_TYPE_FREEZE:
+            case FRAME_TYPE_LIVE:
                 return;
             default:
                 throw new IllegalArgumentException(String.format(