Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Change-Id: I9dcf346d4f06b314993d0590bd26758318bb6e3b

1 files changed, 10 insertions, 5 deletions

diff --git a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
index 17fddf7..3ab3d70 100644
--- a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
+++ b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
@@ -123,11 +123,16 @@ public class QtInAppPurchase
     {
 
         Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
-        serviceIntent.setPackage("com.android.vending.billing");
-        if (!m_context.getPackageManager().queryIntentServices(serviceIntent, 0).isEmpty()) {
-            m_context.bindService(serviceIntent, m_serviceConnection, Context.BIND_AUTO_CREATE);
-        } else {
-            Log.e(TAG, "No in-app billing service available.");
+        serviceIntent.setPackage("com.android.vending");
+        try {
+            if (!m_context.getPackageManager().queryIntentServices(serviceIntent, 0).isEmpty()) {
+                m_context.bindService(serviceIntent, m_serviceConnection, Context.BIND_AUTO_CREATE);
+            } else {
+                Log.e(TAG, "No in-app billing service available.");
+                purchasedProductsQueried(m_nativePointer);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Could not query InAppBillingService intent.");
             purchasedProductsQueried(m_nativePointer);
         }
     }