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

Upgrade to stable ndk 0.8 and ndk-sys 0.5 releases #128

Merged
merged 1 commit into from
Oct 15, 2023
Merged

Upgrade to stable ndk 0.8 and ndk-sys 0.5 releases #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions android-activity/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ log = "0.4"
jni-sys = "0.3"
cesu8 = "1"
jni = "0.21"
ndk-sys = "0.5.0-beta.0"
ndk = "0.8.0-beta.0"
ndk-sys = "0.5.0"
ndk = "0.8.0"
ndk-context = "0.1"
android-properties = "0.2"
num_enum = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion android-activity/src/native_activity/glue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ extern "C" fn ANativeActivity_onCreate(
// code to look up non-standard Java classes.
android_main(app);
})
.unwrap_or_else(|panic| log_panic(panic));
.unwrap_or_else(log_panic);

// Let JVM know that our Activity can be destroyed before detaching from the JVM
//
Expand Down
9 changes: 4 additions & 5 deletions android-activity/src/native_activity/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,13 @@ impl<'a> InputIteratorInner<'a> {
return false;
};

// Note: we basically ignore errors from get_event() currently. Looking
// at the source code for Android's InputQueue, the only error that
// can be returned here is 'WOULD_BLOCK', which we want to just treat as
// meaning the queue is empty.
// Note: we basically ignore errors from event() currently. Looking at the source code for
// Android's InputQueue, the only error that can be returned here is 'WOULD_BLOCK', which we
// want to just treat as meaning the queue is empty.
//
// ref: https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/jni/android_view_InputQueue.cpp
//
if let Ok(Some(ndk_event)) = queue.get_event() {
if let Ok(Some(ndk_event)) = queue.event() {
log::trace!("queue: got event: {ndk_event:?}");

if let Some(ndk_event) = queue.pre_dispatch(ndk_event) {
Expand Down
Loading