Use VrCoreCompatibility check for whether to show an infobar instead of Android package manager.

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;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 
 import org.chromium.base.Log;
-import org.chromium.base.PackageUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.library_loader.LibraryLoader;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.infobar.InfoBarIdentifier;
@@ skipping 38 matching lines @@
     // 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 int VR_CORE_MIN_VERSION = 160723800;
 
     private static final long REENTER_VR_TIMEOUT_MS = 1000;
 
     private final ChromeTabbedActivity mActivity;
     private Intent mEnterVRIntent;
 
     @VrSupportLevel
     private int mVrSupportLevel;
 
     private final VrClassesWrapper mVrClassesWrapper;
@@ skipping 49 matching lines @@
             }
         }
 
         if (mEnterVRIntent == null) {
             mEnterVRIntent =
                     mVrDaydreamApi.createVrIntent(new ComponentName(mActivity, VR_ACTIVITY_ALIAS));
         }
         mVrSupportLevel = mVrDaydreamApi.isDaydreamReadyDevice() ? VR_DAYDREAM : VR_CARDBOARD;
     }
 
-    private boolean verifyOrUpdateVrServices(Tab tab) {
-        if (!LibraryLoader.isInitialized()) {
-            return false;
-        }
-        int vrCoreVersion = PackageUtils.getPackageVersion(mActivity, VR_CORE_PACKAGE_ID);
-        if (vrCoreVersion < VR_CORE_MIN_VERSION) {
-            // Assume upgrade as most common case.
-            String infobarText =
-                    mActivity.getString(R.string.vr_services_check_infobar_update_text);
-            String buttonText =
-                    mActivity.getString(R.string.vr_services_check_infobar_update_button);
-            if (vrCoreVersion == -1) {
-                // VrCore not installed, make sure it's 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;
-                }
-                // Supported, but not installed.  Ask user to install instead of upgrade.
-                infobarText = mActivity.getString(R.string.vr_services_check_infobar_install_text);
-                buttonText = mActivity.getString(R.string.vr_services_check_infobar_install_button);
-            }
-            SimpleConfirmInfoBarBuilder.create(tab,
-                    new SimpleConfirmInfoBarBuilder.Listener() {
-                        @Override
-                        public void onInfoBarDismissed() {}
-
-                        @Override
-                        public boolean onInfoBarButtonClicked(boolean isPrimary) {
-                            mActivity.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;
-        }
-        return true;
-    }
-
     /**
      * Should be called once the native library is loaded so that the native portion of this class
      * can be initialized.
      */
     public void onNativeLibraryReady() {
         updateVrSupportLevel();
         if (mVrSupportLevel == VR_NOT_AVAILABLE) return;
         mNativeVrShellDelegate = nativeInit();
         Choreographer choreographer = Choreographer.getInstance();
         choreographer.postFrameCallback(new FrameCallback() {
@@ skipping 163 matching lines @@
             default:
                 Log.e(TAG, "Unexpected enum.");
         }
     }
 
     /**
      * Enters VR Shell if necessary, displaying browser UI and tab contents in VR.
      */
     @EnterVRResult
     public int enterVRIfNecessary() {
-        // TODO(amp): Move the UpdateVrService check to where it can check after a WebVR API call.
-        if (!verifyOrUpdateVrServices(mActivity.getActivityTab())) return ENTER_VR_CANCELLED;
+        // Update VR support level as it can change at runtime
+        updateVrSupportLevel();
         if (mVrSupportLevel == VR_NOT_AVAILABLE) return ENTER_VR_CANCELLED;
         if (mInVr) return ENTER_VR_NOT_NECESSARY;
         if (!canEnterVR(mActivity.getActivityTab())) return ENTER_VR_CANCELLED;
 
         if (mVrSupportLevel == VR_CARDBOARD || !mVrDaydreamApi.isDaydreamCurrentViewer()) {
             // Avoid using launchInVr which would trigger DON flow regardless current viewer type
             // due to the lack of support for unexported activities.
             enterVR();
         } else {
             if (!mVrDaydreamApi.launchInVr(getPendingEnterVRIntent())) return ENTER_VR_CANCELLED;
@@ skipping 178 matching lines @@
         clearVrModeWindowFlags();
         destroyVrShell();
         mActivity.getFullscreenManager().setPositionsForTabToNonFullscreen();
     }
 
     private boolean isVrCoreCompatible() {
         assert mVrClassesWrapper != null;
         if (mVrCoreVersionChecker == null) {
             mVrCoreVersionChecker = mVrClassesWrapper.createVrCoreVersionChecker();
         }
-        return mVrCoreVersionChecker.isVrCoreCompatible();
+
+        return verifyOrUpdateVrServices(
+                mVrCoreVersionChecker.isVrCoreCompatible(), mActivity.getActivityTab());
+    }
+
+    private boolean verifyOrUpdateVrServices(int vrCoreCompatibility, Tab tab) {
+        if (vrCoreCompatibility == VrCoreVersionChecker.VR_CORE_READY) {
+            return true;
+        }
+        if (tab == null) {
+            return false;
+        }
+
+        String infobarText;
+        String buttonText;
+        if (vrCoreCompatibility == VrCoreVersionChecker.VR_CORE_NOT_AVAILABLE) {
+            // VrCore not installed, make sure it's 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)) {

[bshe, 2017/02/21 15:53:09]

it might be better to move this check outside of VR_CORE_NOT_AVAILABLE check. It
is possible that we want to kill support on platforms that was supported. In
that case, we don't want user to upgrade VrCore even they have VrCore installed.

Also, how long can we keep this field trail? I would imagine that we want to
keep it for a long time since we are now depending on it to decide if certain UI
should show. If we can't use the field trail for this use case, we might just
want to hard code it for now.

[amp, 2017/02/21 19:30:18]

I think we would have to handle that specifically if that case arrived.
I originally had it hard coded to KITKAT, but then thought that it would match
exactly whatever the current experiment is for support.

I'm not sure there is a limit on how long a field trial can go.  As long as we
have to support multiple OS versions with potentially different capabilities I
think we can maintain this field trial.

Leaving as is for now, but ping me to discuss further if you think we should
just hard code it.

[bshe, 2017/02/21 22:03:55]

I am not sure what do you mean by specifically? If you move the code out of this
if block. This should be all we need, right? Or is there something else that you
are thinking of?

[amp, 2017/02/21 22:24:36]

Done.

Sorry, I thought you were referring to a scenario where we were blacklisting
specific platforms and confused myself.

Reading the original comment again I think I understand now. :)

We don't want to show an infobar to users who are on a platform that is no
longer supported (even if they currently have vr core that is just out of date).

+                return false;
+            }
+            // Supported, but not installed.  Ask user to install instead of upgrade.

[bshe, 2017/02/21 15:53:09]

nit: one space between period and "Ask".

[amp, 2017/02/21 19:30:18]

Done.

+            infobarText = mActivity.getString(R.string.vr_services_check_infobar_install_text);
+            buttonText = mActivity.getString(R.string.vr_services_check_infobar_install_button);
+        } else if (vrCoreCompatibility == VrCoreVersionChecker.VR_CORE_OUT_OF_DATE) {
+            infobarText = mActivity.getString(R.string.vr_services_check_infobar_update_text);
+            buttonText = mActivity.getString(R.string.vr_services_check_infobar_update_button);
+        } else {
+            Log.w(TAG, "Unknown VrCore compatibility: " + vrCoreCompatibility);

[bshe, 2017/02/21 15:53:09]

probably worth a Log.e?

[amp, 2017/02/21 19:30:18]

Done.

+            return false;
+        }
+
+        SimpleConfirmInfoBarBuilder.create(tab,
+                new SimpleConfirmInfoBarBuilder.Listener() {
+                    @Override
+                    public void onInfoBarDismissed() {}
+
+                    @Override
+                    public boolean onInfoBarButtonClicked(boolean isPrimary) {
+                        mActivity.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;
         mVrShell = mVrClassesWrapper.createVrShell(this, mActivity.getCompositorViewHolder());
         return mVrShell != null;
     }
 
     private void addVrViews() {
         FrameLayout decor = (FrameLayout) mActivity.getWindow().getDecorView();
@@ skipping 96 matching lines @@
     }
 
     private native long nativeInit();
     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);
 }