[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [android-qt/alpha4] src/android/jar/src/org/kde/necessitas/mobile: Don't crash if DISABLE_KEYGUARD p
From:       BogDan Vatra <bogdan () kde ! org>
Date:       2012-08-31 17:55:43
Message-ID: 20120831175543.33B3BA60D9 () git ! kde ! org
[Download RAW message or body]

Git commit 5977d098ae1b577e684f08d5d3463a968fa4a61f by BogDan Vatra.
Committed on 31/08/2012 at 19:48.
Pushed by vatra into branch 'alpha4'.

Don't crash if DISABLE_KEYGUARD permission is not set.

BUG: 306088
CCBUG: 306088

M  +18   -11   src/android/jar/src/org/kde/necessitas/mobile/QtSystemInfo.java

http://commits.kde.org/android-qt/5977d098ae1b577e684f08d5d3463a968fa4a61f

diff --git a/src/android/jar/src/org/kde/necessitas/mobile/QtSystemInfo.java \
b/src/android/jar/src/org/kde/necessitas/mobile/QtSystemInfo.java index \
                0dbec82..35c3120 100644
--- a/src/android/jar/src/org/kde/necessitas/mobile/QtSystemInfo.java
+++ b/src/android/jar/src/org/kde/necessitas/mobile/QtSystemInfo.java
@@ -146,17 +146,24 @@ public class QtSystemInfo
     private BroadcastReceiver m_generalSystemInfo;
     QtSystemInfo ()
     {
-        QtNative.activity().runOnUiThread(new Runnable() {
+        try
+        {
+            QtNative.activity().runOnUiThread(new Runnable() {
 
-            public void run() {
-//@ANDROID-5
-                m_bluetoothAdapter=BluetoothAdapter.getDefaultAdapter();
-//@ANDROID-5
-            }
-        });
-        m_powerManager = \
                (PowerManager)QtNative.activity().getSystemService(Context.POWER_SERVICE);
                
-        m_telephonyManager= (TelephonyManager) \
                QtNative.activity().getSystemService(Context.TELEPHONY_SERVICE);
-        disableLock();
+                public void run() {
+    //@ANDROID-5
+                    m_bluetoothAdapter=BluetoothAdapter.getDefaultAdapter();
+    //@ANDROID-5
+                }
+            });
+            m_powerManager = \
(PowerManager)QtNative.activity().getSystemService(Context.POWER_SERVICE); +          \
m_telephonyManager= (TelephonyManager) \
QtNative.activity().getSystemService(Context.TELEPHONY_SERVICE); +            \
disableLock(); +        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+        }
     }
 
     public void initScreensaver ()


[prev in list] [next in list] [prev in thread] [next in thread]