Merge 61c4bb480514e2d1a4e4e7e6e082f8b934afdec4 on remote branch
Change-Id: Iec71571f331763ee43824eb2912169b6b8fd6406
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 06f742b..7ddd88d 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,7 +21,7 @@
<uses-sdk
android:minSdkVersion="21"
- android:targetSdkVersion="28" />
+ android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/src/com/android/soundrecorder/util/DatabaseUtils.java b/src/com/android/soundrecorder/util/DatabaseUtils.java
index eabeb71..dd6af6c 100755
--- a/src/com/android/soundrecorder/util/DatabaseUtils.java
+++ b/src/com/android/soundrecorder/util/DatabaseUtils.java
@@ -195,7 +195,6 @@
res.getString(R.string.audio_db_artist_name));
contentValues.put(MediaStore.Audio.Media.DATE_ADDED, (int) (time / 1000));
contentValues.put(MediaStore.Audio.Media.DATA, file.getAbsolutePath());
- contentValues.put(MediaStore.Audio.Media.IS_MUSIC, "1");
contentValues.put(MediaStore.Audio.Media.DATE_MODIFIED, (int) (date / 1000));
contentValues.put(MediaStore.Audio.Media.DURATION, duration);
contentValues.put(MediaStore.Audio.Media.TITLE, fileName);
@@ -289,8 +288,8 @@
MediaStore.Audio.Media.DATE_MODIFIED, MediaStore.Files.FileColumns.PARENT
};
- String selection = MediaStore.Audio.Media.IS_MUSIC + "=1" + " AND "
- + MediaStore.Files.FileColumns.PARENT + "=";
+ String selection = MediaStore.Audio.Media.DURATION + ">1" + " AND "
+ + MediaStore.Files.FileColumns.PARENT + "=";
StringBuilder allSelection = new StringBuilder();
for (int i = 0; i < folderIds.length; i++) {
if (i != 0) {
@@ -310,8 +309,8 @@
MediaStore.Audio.Media.DATE_MODIFIED, MediaStore.Files.FileColumns.PARENT
};
- String selection = MediaStore.Audio.Media.IS_MUSIC + "=1" + " AND "
- + MediaStore.Files.FileColumns.DATA + " LIKE "
+ String selection = MediaStore.Audio.Media.DURATION + ">1" + " AND "
+ + MediaStore.Files.FileColumns.DATA + " LIKE "
+ "\'" + StorageUtils.getPhoneStoragePath()+ "%\'";
return DatabaseUtils.query(resolver, FILE_BASE_URI, projection, selection.toString(),