Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java |
| index 4e3695800f2041b0ee97eeb2984cc4065a5c4785..81694511694d9d6c2d5999f494551725ad0e2a36 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java |
| @@ -7,7 +7,6 @@ package org.chromium.chrome.browser.vr_shell; |
| import com.google.vr.ndk.base.Version; |
| import com.google.vr.vrcore.base.api.VrCoreNotAvailableException; |
| import com.google.vr.vrcore.base.api.VrCoreUtils; |
| -import com.google.vr.vrcore.base.api.VrCoreUtils.ConnectionResult; |
| import org.chromium.base.ContextUtils; |
| import org.chromium.base.Log; |
| @@ -19,7 +18,7 @@ public class VrCoreVersionCheckerImpl implements VrCoreVersionChecker { |
| private static final String TAG = "VrCoreVersionChecker"; |
| @Override |
| - public boolean isVrCoreCompatible() { |
| + public int isVrCoreCompatible() { |
| try { |
| String vrCoreSdkLibraryVersionString = VrCoreUtils.getVrCoreSdkLibraryVersion( |
| ContextUtils.getApplicationContext()); |
| @@ -27,12 +26,13 @@ public class VrCoreVersionCheckerImpl implements VrCoreVersionChecker { |
| Version targetSdkLibraryVersion = |
| Version.parse(com.google.vr.ndk.base.BuildConstants.VERSION); |
| if (!vrCoreSdkLibraryVersion.isAtLeast(targetSdkLibraryVersion)) { |
| - throw new VrCoreNotAvailableException(ConnectionResult.SERVICE_OBSOLETE); |
| + Log.i(TAG, "Unable to find a compatible VrCore."); |
|
bshe
2017/02/21 15:53:08
This is probably not needed in production?
amp
2017/02/21 19:30:18
Done. I was trying to maintain parity with what w
|
| + return VrCoreVersionChecker.VR_CORE_OUT_OF_DATE; |
| } |
| - return true; |
| + return VrCoreVersionChecker.VR_CORE_READY; |
| } catch (VrCoreNotAvailableException e) { |
| - Log.i(TAG, "Unable to find a compatible VrCore."); |
| - return false; |
| + Log.i(TAG, "Unable to find VrCore."); |
| + return VrCoreVersionChecker.VR_CORE_NOT_AVAILABLE; |
| } |
| } |
| } |