Tracks GVR version crossed with headset type using UMA.

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.vr_shell;
 
 import android.os.Build;
 
 import com.google.vr.ndk.base.Version;
 import com.google.vr.vrcore.base.api.VrCoreNotAvailableException;
 import com.google.vr.vrcore.base.api.VrCoreUtils;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.PackageUtils;
-
 import org.chromium.chrome.browser.ChromeFeatureList;
 
 /**
  * Helper class to check if VrCore version is compatible with Chromium.
  */
 public class VrCoreVersionCheckerImpl implements VrCoreVersionChecker {
     private static final String TAG = "VrCoreVersionChecker";
 
     private static final String MIN_SDK_VERSION_PARAM_NAME = "min_sdk_version";
 
     @Override
-    public int getVrCoreCompatibility() {
+    public VrCoreInfo getVrCoreInfo() {
         // Supported Build version is determined by the webvr cardboard support feature.
         // Default is KITKAT unless specified via server side finch config.
         if (Build.VERSION.SDK_INT < ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
                                             ChromeFeatureList.WEBVR_CARDBOARD_SUPPORT,
                                             MIN_SDK_VERSION_PARAM_NAME,
                                             Build.VERSION_CODES.KITKAT)) {
-            return VrCoreVersionChecker.VR_NOT_SUPPORTED;
+            return new VrCoreInfo(null, VrCoreVersionChecker.VR_NOT_SUPPORTED);
         }
         try {
             String vrCoreSdkLibraryVersionString = VrCoreUtils.getVrCoreSdkLibraryVersion(
                     ContextUtils.getApplicationContext());
             Version vrCoreSdkLibraryVersion = Version.parse(vrCoreSdkLibraryVersionString);
             Version targetSdkLibraryVersion =
                     Version.parse(com.google.vr.ndk.base.BuildConstants.VERSION);
             if (!vrCoreSdkLibraryVersion.isAtLeast(targetSdkLibraryVersion)) {
-                return VrCoreVersionChecker.VR_OUT_OF_DATE;
+                return new VrCoreInfo(vrCoreSdkLibraryVersion, VrCoreVersionChecker.VR_OUT_OF_DATE);
             }
-            return VrCoreVersionChecker.VR_READY;
+            return new VrCoreInfo(vrCoreSdkLibraryVersion, VrCoreVersionChecker.VR_READY);
         } catch (VrCoreNotAvailableException e) {
             Log.i(TAG, "Unable to find VrCore.");
             // Old versions of VrCore are not integrated with the sdk library version check and will
             // trigger this exception even though VrCore is installed.
             // Double check package manager to make sure we are not telling user to install
             // when it should just be an update.
             if (PackageUtils.getPackageVersion(
                         ContextUtils.getApplicationContext(), VR_CORE_PACKAGE_ID)
                     != -1) {
-                return VrCoreVersionChecker.VR_OUT_OF_DATE;
+                return new VrCoreInfo(null, VrCoreVersionChecker.VR_OUT_OF_DATE);

[amp, 2017/05/15 23:28:54]

We might be able to pull some kind of version from package utils (the if check
on line 52).

I'm not sure it would compare with the other version we will get from vr core,
though, so I'm not sure it's worth it.  Maybe spend a few minutes looking into
it, but if it isn't usable feel free to keep the version null here.

[tiborg, 2017/05/23 15:47:24]

Checked with the GVR team. There seems to be no easy way to do it. I think for
the logging we are fine with just logging that the GVR version is older.

             }
-            return VrCoreVersionChecker.VR_NOT_AVAILABLE;
+            return new VrCoreInfo(null, VrCoreVersionChecker.VR_NOT_AVAILABLE);
         }
     }
 }