Commit dfe0a800 authored by Klaus Weidner's avatar Klaus Weidner Committed by Commit Bot

WebXR: allow Android 11 package queries for GVR/ARCore

Android 11 by default restricts package status queries:
https://developer.android.com/preview/privacy/package-visibility

Add explicit <queries> entries to declare this dependency.

Bug: 1122210
Change-Id: I51c9457b85031c089da40854d10a1ad3b4abe918
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2378735
Commit-Queue: Klaus Weidner <klausw@chromium.org>
Reviewed-by: default avatarMichael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803285}
parent 50bec60b
......@@ -17,4 +17,12 @@
<!-- This tag indicates that this application optionally uses ARCore. -->
<meta-data android:name="com.google.ar.core" android:value="optional" />
</application>
{% if channel in ['default'] %}
<queries>
<!-- TODO(https://crbug.com/1122210): This is needed for Android 11 to
allow checking if ARCore is installed when using ToT builds. -->
<package android:name="com.google.ar.core" />
</queries>
{% endif %}
</manifest>
......@@ -23,4 +23,12 @@
<application>
</application>
{% if channel in ['default'] %}
<queries>
<!-- TODO(https://crbug.com/1122210): This is needed for Android 11 to
allow checking if GVR is installed when using ToT builds. -->
<package android:name="com.google.vr.vrcore" />
</queries>
{% endif %}
</manifest>
......@@ -124,6 +124,27 @@ by a child template that "extends" this file.
{% block extra_keyset_definitions %}
{% endblock %}
{% if channel in ['default'] %}
<!--
Android 11 (R) restricts querying for installed packages. WebXR uses
ARCore and/or GVR, and needs to be able to check their installation
status so that it can show install/update infobars if necessary.
Official builds (stable, beta, dev, canary) handle this differently,
this setting is for locally deployed ToT builds only.
TODO(https://crbug.com/1122210): remove if this is replaced by an
alternate mechanism.
-->
<queries>
{% if include_arcore_manifest_flag == 'true' %}
<package android:name="com.google.ar.core" />
{% endif %}
{% if enable_vr == "true" %}
<package android:name="com.google.vr.vrcore" />
{% endif %}
</queries>
{% endif %}
<!-- Set android:largeHeap to "true" to allow more than the default
Java heap limit (32Mb on Nexus S, 48Mb on Xoom). -->
<application android:name="{% block application_name %}org.chromium.chrome.browser.ChromeApplication{% endblock %}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment