Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(Android) Add RECEIVER_EXPORTED flags upon registering receiver for Android 12+ requirements #13438

Open
wants to merge 6 commits into
base: development
Choose a base branch
from
Open

(Android) Add RECEIVER_EXPORTED flags upon registering receiver for Android 12+ requirements #13438

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8af9f34
[StepSecurity] ci: Harden GitHub Actions
step-security-bot Jun 10, 2024
8dab581
PR #13016 from step-security-bot: [StepSecurity] ci: Harden GitHub Ac…
Nir-Az Jun 11, 2024
07e57c2
update NVIDIA docs
Nir-Az Jun 9, 2024
e1688cc
PR #13045 from Nir-Az: Update NVIDIA docs
Nir-Az Jun 17, 2024
4365720
added Exported or NotExported flags to receivers for Android 12+
jnnguyen12 Oct 18, 2024
a436238
Merge branch 'development' into exported_flags
jnnguyen12 Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Enumerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.hardware.usb.UsbManager;
import android.os.Build;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
Expand Down Expand Up @@ -64,9 +65,26 @@ public Enumerator(Context context, DeviceListener listener){
mListener = listener;
mContext = context;

context.registerReceiver(mBroadcastReceiver, new IntentFilter(UsbUtilities.ACTION_USB_PERMISSION));
context.registerReceiver(mBroadcastReceiver, new IntentFilter(UsbManager.ACTION_USB_DEVICE_ATTACHED));
context.registerReceiver(mBroadcastReceiver, new IntentFilter(UsbManager.ACTION_USB_DEVICE_DETACHED));
// Extra flag to counteract the extra requirements to pass an exported or not-exported value
// when broadcasting for Android 12 and up.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
context.registerReceiver(mBroadcastReceiver,
new IntentFilter(UsbUtilities.ACTION_USB_PERMISSION),
Context.RECEIVER_EXPORTED);

context.registerReceiver(mBroadcastReceiver,
new IntentFilter(UsbManager.ACTION_USB_DEVICE_ATTACHED),
Context.RECEIVER_EXPORTED);

context.registerReceiver(mBroadcastReceiver,
new IntentFilter(UsbManager.ACTION_USB_DEVICE_DETACHED),
Context.RECEIVER_EXPORTED);
} else {
// For pre-Android 12 versions, use the standard registerReceiver without the export flag
context.registerReceiver(mBroadcastReceiver, new IntentFilter(UsbUtilities.ACTION_USB_PERMISSION));
context.registerReceiver(mBroadcastReceiver, new IntentFilter(UsbManager.ACTION_USB_DEVICE_ATTACHED));
context.registerReceiver(mBroadcastReceiver, new IntentFilter(UsbManager.ACTION_USB_DEVICE_DETACHED));
}

onDeviceAttach(context);
}
Expand Down