Merge "MTP: Don't fail in playlist transfer if not all playlist items can be found."

1 files changed, 1 insertions, 6 deletions

diff --git a/media/java/android/media/MtpDatabase.java b/media/java/android/media/MtpDatabase.java
index 250ec4403d21..03879892799d 100644
--- a/media/java/android/media/MtpDatabase.java
+++ b/media/java/android/media/MtpDatabase.java
@@ -169,11 +169,6 @@ public class MtpDatabase {
             // handle abstract playlists separately
             // they do not exist in the file system so don't use the media scanner here
             if (format == MtpConstants.FORMAT_ABSTRACT_AV_PLAYLIST) {
-                // Strip Windows Media Player file extension
-                if (path.endsWith(".pla")) {
-                    path = path.substring(0, path.length() - 4);
-                }
-
                 // extract name from path
                 String name = path;
                 int lastSlash = name.lastIndexOf('/');
@@ -1005,7 +1000,7 @@ public class MtpDatabase {
             valuesList[i] = values;
         }
         try {
-            if (count == mMediaProvider.bulkInsert(uri, valuesList)) {
+            if (mMediaProvider.bulkInsert(uri, valuesList) > 0) {
                 return MtpConstants.RESPONSE_OK;
             }
         } catch (RemoteException e) {