From 5888465f16fb2ccc7c8722d764b23b5b607a9185 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 14 Jun 2024 15:26:26 +0300 Subject: [PATCH] Android: make internal Java code for QtAndroidExtras private This Java code is mainly an internal implementation detail for the Qt for Android plugin, and isn't meant to be public in the first place. Task-number: QTBUG-126371 Change-Id: Ic111439a929fa5ad05aca98dd7fa024791a00883 Reviewed-by: Ville Voutilainen (cherry picked from commit eb4e417ef64b832cddfb60fb9e20b0a04ec1ad2a) Reviewed-by: Qt Cherry-pick Bot --- .../org/qtproject/qt/android/extras/QtAndroidBinder.java | 4 ++-- .../qt/android/extras/QtAndroidServiceConnection.java | 4 ++-- .../jar/src/org/qtproject/qt/android/extras/QtNative.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/extras/QtAndroidBinder.java b/src/android/jar/src/org/qtproject/qt/android/extras/QtAndroidBinder.java index bd837570fe..31a0d68c0a 100644 --- a/src/android/jar/src/org/qtproject/qt/android/extras/QtAndroidBinder.java +++ b/src/android/jar/src/org/qtproject/qt/android/extras/QtAndroidBinder.java @@ -11,12 +11,12 @@ import org.qtproject.qt.android.UsedFromNativeCode; class QtAndroidBinder extends Binder { @UsedFromNativeCode - public QtAndroidBinder(long id) + QtAndroidBinder(long id) { m_id = id; } - public void setId(long id) + void setId(long id) { synchronized(this) { diff --git a/src/android/jar/src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java b/src/android/jar/src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java index b70b64e3ac..fbf9232204 100644 --- a/src/android/jar/src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java +++ b/src/android/jar/src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java @@ -12,12 +12,12 @@ import org.qtproject.qt.android.UsedFromNativeCode; class QtAndroidServiceConnection implements ServiceConnection { @UsedFromNativeCode - public QtAndroidServiceConnection(long id) + QtAndroidServiceConnection(long id) { m_id = id; } - public void setId(long id) + void setId(long id) { synchronized(this) { diff --git a/src/android/jar/src/org/qtproject/qt/android/extras/QtNative.java b/src/android/jar/src/org/qtproject/qt/android/extras/QtNative.java index f7ba8dd9b4..bec30c7e7e 100644 --- a/src/android/jar/src/org/qtproject/qt/android/extras/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt/android/extras/QtNative.java @@ -8,10 +8,10 @@ import android.os.Parcel; class QtNative { // Binder - public static native boolean onTransact(long id, int code, Parcel data, Parcel reply, int flags); + static native boolean onTransact(long id, int code, Parcel data, Parcel reply, int flags); // ServiceConnection - public static native void onServiceConnected(long id, String name, IBinder service); - public static native void onServiceDisconnected(long id, String name); + static native void onServiceConnected(long id, String name, IBinder service); + static native void onServiceDisconnected(long id, String name); }