diff --git a/.gitignore b/.gitignore index d7db16c..88ee1d5 100644 --- a/.gitignore +++ b/.gitignore @@ -422,4 +422,8 @@ MigrationBackup/ # End of https://www.toptal.com/developers/gitignore/api/git,c++,cmake,visualstudio -build \ No newline at end of file +# Android +build +wrappers/android/realsenseid/src/standard/cpp_gen/ +wrappers/android/realsenseid/src/standard/java/com/intel/realsenseid/api/ +wrappers/android/realsenseid/src/standard/swig.i diff --git a/Dockerfile b/Dockerfile index ae80f7c..d2c7c72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,6 +56,6 @@ RUN set -eux; \ $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "cmake;3.31.6" ## HOW TO BUILD -# docker build -t rsid-builder:latest . +# docker build --platform=linux/amd64 -t rsid-builder:latest . # docker run --rm -it -v.:/rsid-builder rsid-builder bash -c "cd wrappers/android && ./gradlew clean bundleStandardReleaseAar" -# Find your output in `wrappers/android/build/outputs/aar/` \ No newline at end of file +# Find your output in `wrappers/android/realsenseid/build/outputs/aar/` diff --git a/wrappers/android/gradlew b/wrappers/android/gradlew old mode 100644 new mode 100755 diff --git a/wrappers/android/realsenseid/src/standard/java/com/intel/realsenseid/impl/UsbCdcConnection.java b/wrappers/android/realsenseid/src/standard/java/com/intel/realsenseid/impl/UsbCdcConnection.java index f0f226e..460f635 100644 --- a/wrappers/android/realsenseid/src/standard/java/com/intel/realsenseid/impl/UsbCdcConnection.java +++ b/wrappers/android/realsenseid/src/standard/java/com/intel/realsenseid/impl/UsbCdcConnection.java @@ -1,5 +1,6 @@ package com.intel.realsenseid.impl; +import static android.app.PendingIntent.FLAG_IMMUTABLE; import static android.hardware.usb.UsbConstants.USB_CLASS_CDC_DATA; import static android.hardware.usb.UsbConstants.USB_CLASS_COMM; import static android.hardware.usb.UsbConstants.USB_DIR_IN; @@ -111,7 +112,7 @@ public boolean FindSupportedDevice(Context context) { public void RequestDevicePermission(Context context, final PermissionCallback callback) { final var ACTION_USB_PERMISSION = "com.realsense.rsid.USB_PERMISSION"; - var permissionIntent = PendingIntent.getBroadcast(context, 0, new Intent(ACTION_USB_PERMISSION), 0); + var permissionIntent = PendingIntent.getBroadcast(context, 0, new Intent(ACTION_USB_PERMISSION), FLAG_IMMUTABLE); var filter = new IntentFilter(ACTION_USB_PERMISSION); var usbPermissionReceiver = new BroadcastReceiver() { @Override