Merge "app crash due to Invalid column count IllegalArgumentException" am: 30b3ba89e4 am: 1a3969c61eandroid-r-preview-4android-r-preview-3android-r-preview-2

Change-Id: Ia9173eb1935814c1e2a1b62afb63b06adba39850

1 files changed, 15 insertions, 11 deletions

diff --git a/src/com/android/soundrecorder/SoundRecorder.java b/src/com/android/soundrecorder/SoundRecorder.java
index 3970188..2067d6a 100644
--- a/src/com/android/soundrecorder/SoundRecorder.java
+++ b/src/com/android/soundrecorder/SoundRecorder.java
@@ -533,18 +533,22 @@ public class SoundRecorder extends Activity
      * play_order in the playlist.
      */
     private void addToPlaylist(ContentResolver resolver, int audioId, long playlistId) {
-        String[] cols = new String[] {
+        try {
+            String[] cols = new String[] {
                 "count(*)"
-        };
-        Uri uri = MediaStore.Audio.Playlists.Members.getContentUri("external", playlistId);
-        Cursor cur = resolver.query(uri, cols, null, null, null);
-        cur.moveToFirst();
-        final int base = cur.getInt(0);
-        cur.close();
-        ContentValues values = new ContentValues();
-        values.put(MediaStore.Audio.Playlists.Members.PLAY_ORDER, Integer.valueOf(base + audioId));
-        values.put(MediaStore.Audio.Playlists.Members.AUDIO_ID, audioId);
-        resolver.insert(uri, values);
+            };
+            Uri uri = MediaStore.Audio.Playlists.Members.getContentUri("external", playlistId);
+            Cursor cur = resolver.query(uri, cols, null, null, null);
+            cur.moveToFirst();
+            final int base = cur.getInt(0);
+            cur.close();
+            ContentValues values = new ContentValues();
+            values.put(MediaStore.Audio.Playlists.Members.PLAY_ORDER, Integer.valueOf(base + audioId));
+            values.put(MediaStore.Audio.Playlists.Members.AUDIO_ID, audioId);
+            resolver.insert(uri, values);
+        } catch (IllegalArgumentException ex) {
+            Log.e(TAG, "Catch IllegalArgumentException: Invalid column count(*)");
+        }
     }
     
     /*