From f70b1abd88cf6a0eea7d4547151e715c673d28ef Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Thu, 29 Oct 2020 11:16:14 -0500
Subject: [PATCH] d/android: Use not-deprecated API when possible.

---
 src/xrt/drivers/android/android_sensors.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/xrt/drivers/android/android_sensors.c b/src/xrt/drivers/android/android_sensors.c
index e65929a10..e425e7020 100644
--- a/src/xrt/drivers/android/android_sensors.c
+++ b/src/xrt/drivers/android/android_sensors.c
@@ -17,6 +17,8 @@
 #include "util/u_var.h"
 #include "util/u_distortion_mesh.h"
 
+#include <xrt/xrt_config_android.h>
+
 // 60 events per second (in us).
 #define POLL_RATE_USEC (1000L / 60) * 1000
 
@@ -87,7 +89,13 @@ android_run_thread(void *ptr)
 {
 	struct android_device *d = (struct android_device *)ptr;
 
+#if __ANDROID_API__ >= 26
+	d->sensor_manager =
+	    ASensorManager_getInstanceForPackage(XRT_ANDROID_PACKAGE);
+#else
 	d->sensor_manager = ASensorManager_getInstance();
+#endif
+
 	d->accelerometer = ASensorManager_getDefaultSensor(
 	    d->sensor_manager, ASENSOR_TYPE_ACCELEROMETER);
 	d->gyroscope = ASensorManager_getDefaultSensor(d->sensor_manager,