Intercept WebVR api calls and check for VrCore compatibility.

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.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.app.Activity;
 import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Handler;
 import android.os.StrictMode;
 import android.os.SystemClock;
 import android.support.annotation.IntDef;
 import android.view.Choreographer;
 import android.view.Choreographer.FrameCallback;
 import android.view.Display;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
@@ skipping 49 matching lines @@
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({VR_NOT_AVAILABLE, VR_CARDBOARD, VR_DAYDREAM})
     public @interface VrSupportLevel {}
 
     // TODO(bshe): These should be replaced by string provided by NDK. Currently, it only available
     // in SDK and we don't want add dependency to SDK just to get these strings.
     private static final String DAYDREAM_CATEGORY = "com.google.intent.category.DAYDREAM";
     private static final String CARDBOARD_CATEGORY = "com.google.intent.category.CARDBOARD";
 
-    private static final String MIN_SDK_VERSION_PARAM_NAME = "min_sdk_version";
-
     private static final String VR_ACTIVITY_ALIAS =
             "org.chromium.chrome.browser.VRChromeTabbedActivity";
 
     private static final String VR_CORE_PACKAGE_ID = "com.google.vr.vrcore";
 
     private static final long REENTER_VR_TIMEOUT_MS = 1000;
 
     private static VrShellDelegate sInstance;
 
     private final ChromeActivity mActivity;
@@ skipping 125 matching lines @@
 
     public static int getVrSupportLevel(VrDaydreamApi daydreamApi,
             VrCoreVersionChecker versionChecker, Tab tabToShowInfobarIn) {
         if (versionChecker == null || daydreamApi == null
                 || !isVrCoreCompatible(versionChecker, tabToShowInfobarIn)) {
             return VR_NOT_AVAILABLE;
         }
 
         if (daydreamApi.isDaydreamReadyDevice()) return VR_DAYDREAM;
 
-        // Check cardboard support for non-daydream devices. 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 VR_NOT_AVAILABLE;
-        }
-
         return VR_CARDBOARD;
     }
 
     @CalledByNative
     private static VrShellDelegate getInstance() {
         Activity activity = ApplicationStatus.getLastTrackedFocusedActivity();
         if (sInstance != null && activity instanceof ChromeTabbedActivity) return sInstance;
         if (!LibraryLoader.isInitialized()) return null;
         // Note that we only support ChromeTabbedActivity for now.
         if (activity == null || !(activity instanceof ChromeTabbedActivity)) return null;
@@ skipping 365 matching lines @@
     private void onExitVRResult(boolean success) {
         assert mVrSupportLevel != VR_NOT_AVAILABLE;
         // For now, we don't handle re-entering VR when exit fails, so keep trying to exit.
         if (!success && sInstance.mVrDaydreamApi.exitFromVr(EXIT_VR_RESULT, new Intent())) return;
         sInstance.mVrClassesWrapper.setVrModeEnabled(sInstance.mActivity, false);
     }
 
     @CalledByNative
     private long createNonPresentingNativeContext() {
         if (mVrClassesWrapper == null) return 0;
+        // Update VR support level as it can change at runtime
+        updateVrSupportLevel();
+        if (mVrSupportLevel == VR_NOT_AVAILABLE) return 0;
         mNonPresentingGvrContext = mVrClassesWrapper.createNonPresentingGvrContext(mActivity);
         if (mNonPresentingGvrContext == null) return 0;
         return mNonPresentingGvrContext.getNativeGvrContext();
     }
 
     @CalledByNative
     private void shutdownNonPresentingNativeContext() {
         if (mNonPresentingGvrContext == null) return;
         mNonPresentingGvrContext.shutdown();
         mNonPresentingGvrContext = null;
@@ skipping 32 matching lines @@
         mRestoreOrientation = null;
         mVrShell.pause();
         removeVrViews();
         clearVrModeWindowFlags();
         destroyVrShell();
         mActivity.getFullscreenManager().setPositionsForTabToNonFullscreen();
     }
 
     private static boolean isVrCoreCompatible(
             VrCoreVersionChecker versionChecker, Tab tabToShowInfobarIn) {
-        return verifyOrUpdateVrServices(
-                versionChecker.getVrCoreCompatibility(), tabToShowInfobarIn);
+        int vrCoreCompatibility = versionChecker.getVrCoreCompatibility();
+
+        if (vrCoreCompatibility == VrCoreVersionChecker.VR_NOT_AVAILABLE
+                || vrCoreCompatibility == VrCoreVersionChecker.VR_OUT_OF_DATE) {
+            promptToUpdateVrServices(vrCoreCompatibility, tabToShowInfobarIn);
+        }
+
+        return vrCoreCompatibility == VrCoreVersionChecker.VR_READY;
     }
 
-    private static boolean verifyOrUpdateVrServices(int vrCoreCompatibility, Tab tab) {
-        if (vrCoreCompatibility == VrCoreVersionChecker.VR_READY) {
-            return true;
-        }
+    private static void promptToUpdateVrServices(int vrCoreCompatibility, Tab tab) {
         if (tab == null) {
-            return false;
-        }
-        // Make sure OS is supported before showing the user a prompt.
-        if (Build.VERSION.SDK_INT < ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
-                                            ChromeFeatureList.WEBVR_CARDBOARD_SUPPORT,
-                                            MIN_SDK_VERSION_PARAM_NAME,
-                                            Build.VERSION_CODES.KITKAT)) {
-            return false;
+            return;
         }
         final Activity activity = tab.getActivity();
         String infobarText;
         String buttonText;
         if (vrCoreCompatibility == VrCoreVersionChecker.VR_NOT_AVAILABLE) {
             // Supported, but not installed. Ask user to install instead of upgrade.
             infobarText = activity.getString(R.string.vr_services_check_infobar_install_text);
             buttonText = activity.getString(R.string.vr_services_check_infobar_install_button);
         } else if (vrCoreCompatibility == VrCoreVersionChecker.VR_OUT_OF_DATE) {
             infobarText = activity.getString(R.string.vr_services_check_infobar_update_text);
             buttonText = activity.getString(R.string.vr_services_check_infobar_update_button);
         } else {
             Log.e(TAG, "Unknown VrCore compatibility: " + vrCoreCompatibility);
-            return false;
+            return;
         }
 
         SimpleConfirmInfoBarBuilder.create(tab,
                 new SimpleConfirmInfoBarBuilder.Listener() {
                     @Override
                     public void onInfoBarDismissed() {}
 
                     @Override
                     public boolean onInfoBarButtonClicked(boolean isPrimary) {
                         activity.startActivity(new Intent(Intent.ACTION_VIEW,
                                 Uri.parse("market://details?id=" + VR_CORE_PACKAGE_ID)));
                         return false;
                     }
                 },
                 InfoBarIdentifier.VR_SERVICES_UPGRADE_ANDROID, R.drawable.vr_services, infobarText,
                 buttonText, null, true);
-        return false;
     }
 
     private boolean createVrShell() {
         if (mVrClassesWrapper == null) return false;
         mTabModelSelector = mActivity.getCompositorViewHolder().detachForVR();
         if (mTabModelSelector == null) return false;
         mVrShell = mVrClassesWrapper.createVrShell(mActivity, this, mTabModelSelector);
         return mVrShell != null;
     }
 
@@ skipping 88 matching lines @@
     private native long nativeInit();
     private static native void nativeOnLibraryAvailable();
     private native void nativeSetPresentResult(long nativeVrShellDelegate, boolean result);
     private native void nativeDisplayActivate(long nativeVrShellDelegate);
     private native void nativeUpdateVSyncInterval(long nativeVrShellDelegate, long timebaseNanos,
             double intervalSeconds);
     private native void nativeOnPause(long nativeVrShellDelegate);
     private native void nativeOnResume(long nativeVrShellDelegate);
     private native void nativeDestroy(long nativeVrShellDelegate);
 }