1 files changed, 17 insertions, 48 deletions

diff --git a/src/android/jar/src/org/qtproject/qt/android/QtThread.java b/src/android/jar/src/org/qtproject/qt/android/QtThread.java
index 1689174e86..0943ad3265 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtThread.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtThread.java
@@ -1,51 +1,15 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 BogDan Vatra <bogdan@kdab.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Android port of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 BogDan Vatra <bogdan@kdab.com>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 package org.qtproject.qt.android;
 
 import java.util.ArrayList;
 import java.util.concurrent.Semaphore;
 
-public class QtThread {
-    private ArrayList<Runnable> m_pendingRunnables = new ArrayList<Runnable>();
+class QtThread {
+    private final ArrayList<Runnable> m_pendingRunnables = new ArrayList<>();
     private boolean m_exit = false;
-    private Thread m_qtThread = new Thread(new Runnable() {
+    private final Thread m_qtThread = new Thread(new Runnable() {
         @Override
         public void run() {
             while (!m_exit) {
@@ -54,7 +18,7 @@ public class QtThread {
                     synchronized (m_qtThread) {
                         if (m_pendingRunnables.size() == 0)
                             m_qtThread.wait();
-                        pendingRunnables = new ArrayList<Runnable>(m_pendingRunnables);
+                        pendingRunnables = new ArrayList<>(m_pendingRunnables);
                         m_pendingRunnables.clear();
                     }
                     for (Runnable runnable : pendingRunnables)
@@ -78,15 +42,20 @@ public class QtThread {
         }
     }
 
+    public void sleep(int milliseconds) {
+        try {
+            m_qtThread.sleep(milliseconds);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
     public void run(final Runnable runnable) {
         final Semaphore sem = new Semaphore(0);
         synchronized (m_qtThread) {
-            m_pendingRunnables.add(new Runnable() {
-                @Override
-                public void run() {
-                    runnable.run();
-                    sem.release();
-                }
+            m_pendingRunnables.add(() -> {
+                runnable.run();
+                sem.release();
             });
             m_qtThread.notify();
         }