Merge "Adding fusion bit to VmsLayer to enable clients to publish and subscribe to fused layers explicitly, Will add more tests that cover fused vs. non fused offering and availability as part of HAL (property) integration."

1 files changed, 16 insertions, 4 deletions

diff --git a/car-lib/src/android/car/vms/VmsLayer.java b/car-lib/src/android/car/vms/VmsLayer.java
index afd0ae7835..36a9a42b39 100644
--- a/car-lib/src/android/car/vms/VmsLayer.java
+++ b/car-lib/src/android/car/vms/VmsLayer.java
@@ -39,9 +39,13 @@ public final class VmsLayer implements Parcelable {
     // The layer version.
     private int mVersion;
 
-    public VmsLayer(int id, int version) {
+    // The layer type.
+    private int mSubType;
+
+    public VmsLayer(int id, int version, int subType) {
         mId = id;
         mVersion = version;
+        mSubType = subType;
     }
 
     public int getId() {
@@ -52,6 +56,10 @@ public final class VmsLayer implements Parcelable {
         return mVersion;
     }
 
+    public int getSubType() {
+        return mSubType;
+    }
+
     /**
      * Checks the two objects for equality by comparing their IDs and Versions.
      *
@@ -64,7 +72,9 @@ public final class VmsLayer implements Parcelable {
             return false;
         }
         VmsLayer p = (VmsLayer) o;
-        return Objects.equals(p.mId, mId) && Objects.equals(p.mVersion, mVersion);
+        return Objects.equals(p.mId, mId) &&
+            Objects.equals(p.mVersion, mVersion) &&
+            Objects.equals(p.mSubType, mSubType);
     }
 
     /**
@@ -74,12 +84,12 @@ public final class VmsLayer implements Parcelable {
      */
     @Override
     public int hashCode() {
-        return Objects.hash(mId, mVersion);
+        return Objects.hash(mId, mVersion, mSubType);
     }
 
     @Override
     public String toString() {
-        return "VmsLayer{" + mId + " " + mVersion + "}";
+        return "VmsLayer{ ID: " + mId + ", Version: " + mVersion + ", Sub type: " + mSubType + "}";
     }
 
 
@@ -99,6 +109,7 @@ public final class VmsLayer implements Parcelable {
     public void writeToParcel(Parcel out, int flags) {
         out.writeInt(mId);
         out.writeInt(mVersion);
+        out.writeInt(mSubType);
     }
 
     @Override
@@ -113,5 +124,6 @@ public final class VmsLayer implements Parcelable {
     private void readFromParcel(Parcel in) {
         mId = in.readInt();
         mVersion = in.readInt();
+        mSubType = in.readInt();
     }
 }
\ No newline at end of file