Android: Fix for uncaught java exception.

If an exception's getMessage() function returns a null object, we can't
send it directly to the Log function, as it will throw an exception...
To avoid this we can prepend the string from getMessage() with an empty
string.

Change-Id: Ie026cbf9af133352919a4536c152b6d35cb8c0a7
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
index b2115b7d9..e4dbae632 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
+++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
@@ -82,7 +82,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
         try {
             mApplicationContext = activity.getApplicationContext();
         } catch(final Exception e) {
-            Log.d(TAG, e.getMessage());
+            Log.d(TAG, "" + e.getMessage());
         }
     }
 
@@ -101,7 +101,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
                     currentPosition = getCurrentPosition();
                 }
             } catch (final InterruptedException e) {
-                Log.d(TAG, e.getMessage());
+                Log.d(TAG, "" + e.getMessage());
                 return;
             }
         }
@@ -262,7 +262,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
             progressThread.start();
         } catch (final IllegalStateException e) {
             reset();
-            Log.d(TAG, e.getMessage());
+            Log.d(TAG, "" + e.getMessage());
         }
     }
 
@@ -276,7 +276,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
             super.pause();
         } catch (final IllegalStateException e) {
             reset();
-            Log.d(TAG, e.getMessage());
+            Log.d(TAG, "" + e.getMessage());
         }
     }
 
@@ -289,7 +289,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
         try {
             super.stop();
         } catch (final IllegalStateException e) {
-            Log.d(TAG, e.getMessage());
+            Log.d(TAG, "" + e.getMessage());
         } finally {
             reset();
         }
@@ -305,7 +305,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
             super.seekTo(msec);
             onMediaPlayerInfoNative(MEDIA_PLAYER_PROGRESS, msec, mID);
         } catch (final IllegalStateException e) {
-            Log.d(TAG, e.getMessage());
+            Log.d(TAG, "" + e.getMessage());
         }
     }
 
@@ -320,7 +320,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
         try {
             playing = super.isPlaying();
         } catch (final IllegalStateException e) {
-            Log.d(TAG, e.getMessage());
+            Log.d(TAG, "" + e.getMessage());
         }
 
         return playing;
@@ -345,13 +345,13 @@ public class QtAndroidMediaPlayer extends MediaPlayer
                           /* MEDIA_ERROR_UNSUPPORTED= */ -1010,
                           mID);
         } catch (final IllegalArgumentException e) {
-            Log.d(TAG, e.getMessage());
+            Log.d(TAG, "" + e.getMessage());
         } catch (final SecurityException e) {
-            Log.d(TAG, e.getMessage());
+            Log.d(TAG, "" + e.getMessage());
         } catch (final IllegalStateException e) {
-            Log.d(TAG, e.getMessage());
+            Log.d(TAG, "" + e.getMessage());
         } catch (final NullPointerException e) {
-            Log.d(TAG, e.getMessage());
+            Log.d(TAG, "" + e.getMessage());
         }
     }
 
@@ -366,7 +366,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
        try {
            currentPosition = super.getCurrentPosition();
        } catch (final IllegalStateException e) {
-           Log.d(TAG, e.getMessage());
+           Log.d(TAG, "" + e.getMessage());
        }
 
        return currentPosition;
@@ -383,7 +383,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
        try {
            duration = super.getDuration();
        } catch (final IllegalStateException e) {
-           Log.d(TAG, e.getMessage());
+           Log.d(TAG, "" + e.getMessage());
        }
 
        return duration;
@@ -415,7 +415,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
            if (!mMuted)
                mVolume = volume;
        } catch (final IllegalStateException e) {
-           Log.d(TAG, e.getMessage());
+           Log.d(TAG, "" + e.getMessage());
        }
    }