@@ -8,14 +8,15 @@ import org.mozilla.vrbrowser.BuildConfig;
 
 public class DeviceType {
     // These values need to match those in Device.h
-    @IntDef(value = { Unknown, OculusGo, OculusQuest, ViveFocusPlus, PicoNeo2, PicoG2 })
+    @IntDef(value = { Unknown, OculusGo, OculusQuest, ViveFocus, ViveFocusPlus, PicoNeo2, PicoG2 })
     public @interface Type {}
     public static final int Unknown = 0;
     public static final int OculusGo = 1;
     public static final int OculusQuest = 2;
-    public static final int ViveFocusPlus = 3;
-    public static final int PicoNeo2 = 4;
-    public static final int PicoG2 = 5;
+    public static final int ViveFocus = 3;
+    public static final int ViveFocusPlus = 4;
+    public static final int PicoNeo2 = 6;
+    public static final int PicoG2 = 7;
 
     private static @Type int mType = Unknown;
 
package org.mozilla.vrbrowser.utils;

import android.util.Log;

import androidx.annotation.IntDef;

import org.mozilla.vrbrowser.BuildConfig;

public class DeviceType {
    // These values need to match those in Device.h
    @IntDef(value = { Unknown, OculusGo, OculusQuest, ViveFocusPlus, PicoNeo2, PicoG2 })
    public @interface Type {}
    public static final int Unknown = 0;
    public static final int OculusGo = 1;
    public static final int OculusQuest = 2;
    public static final int ViveFocusPlus = 3;
    public static final int PicoNeo2 = 4;
    public static final int PicoG2 = 5;

    private static @Type int mType = Unknown;

    public static void setType(@Type int aType) {
        String name;
        switch (aType) {
            case OculusGo:
                name = "Oculus Go";
                break;
            case OculusQuest:
                name = "Oculus Quest";
                break;
            case ViveFocusPlus:
                name = "Vive Focus Plus";
                break;
            case PicoNeo2:
                name = "Pico Neo 2";
                break;
            case PicoG2:
                name = "Pico G2";
                break;
            default:
                name = "Unknown Type";
        }
        Log.d("VRB", "Setting device type to: " + name);
        mType = aType;
    }
    public static @Type int getType() {
        return mType;
    }

    public static boolean isOculusBuild() {
        return BuildConfig.FLAVOR_platform.toLowerCase().contains("oculusvr");
    }

    public static boolean isOculus6DOFBuild() {
        return BuildConfig.FLAVOR_platform.equalsIgnoreCase("oculusvr") || BuildConfig.FLAVOR_platform.equalsIgnoreCase("oculusvrStore");
    }

    public static boolean isWaveBuild() {
        return BuildConfig.FLAVOR_platform.toLowerCase().contains("wavevr");
    }

    public static boolean isPicoVR() {
        return BuildConfig.FLAVOR_platform.toLowerCase().contains("picovr");
    }
}

Looks like PicoNeo2 should be 6 and PicoGaze should be 5?