From cec89ae7519153961141d919434ac30f53e17b26 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Tue, 25 Jan 2022 14:43:50 -0600
Subject: [PATCH] targets: Update manifests for Android 12

---
 .../targets/android_common/src/main/AndroidManifest.xml  | 3 ++-
 .../targets/openxr_android/src/main/AndroidManifest.xml  | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/xrt/targets/android_common/src/main/AndroidManifest.xml b/src/xrt/targets/android_common/src/main/AndroidManifest.xml
index d9ed1a441..a06437680 100644
--- a/src/xrt/targets/android_common/src/main/AndroidManifest.xml
+++ b/src/xrt/targets/android_common/src/main/AndroidManifest.xml
@@ -49,7 +49,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <!-- Main "about" activity -->
-        <activity android:name=".AboutActivity">
+        <activity android:name=".AboutActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml b/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml
index 1669e1cf4..d2c26d61e 100644
--- a/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml
+++ b/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.freedesktop.monado.openxr_runtime">
     <!--
-        Copyright 2020, Collabora, Ltd.
+        Copyright 2020-2022, Collabora, Ltd.
         SPDX-License-Identifier: BSL-1.0
     -->
 
@@ -38,6 +39,9 @@
         android:name="android.hardware.sensor.hifi_sensors"
         android:required="false" />
 
+    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS"
+        tools:ignore="HighSamplingRate" />
+
     <application
         android:name=".MonadoOpenXrApplication"
         android:allowBackup="true"
@@ -52,7 +56,8 @@
             android:name="org.freedesktop.monado.android_common.MonadoVrListener"
             android:icon="@drawable/ic_monado_logo"
             android:label="@string/app_name"
-            android:permission="android.permission.BIND_VR_LISTENER_SERVICE">
+            android:permission="android.permission.BIND_VR_LISTENER_SERVICE"
+            android:exported="true">
             <meta-data
                 android:name="org.khronos.openxr.OpenXRRuntime"
                 android:value="libopenxr_monado.so" />