Merge pull request #491 from TakayukiHoshi1984/bugfix_android10_mediaplayer

不具合修正: Android 10 上の MediaPlayer プロファイルでメディアを再生できない場合がある

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/mediaplayer/HostMediaPlayerManager.java

@@ -230,14 +230,14 @@ public void putMediaId(final Intent response, final String mediaId) {
         mMyCurrentMediaId = mediaId;
 
         // Videoとしてパスを取得
-        Uri mUri = ContentUris.withAppendedId(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, Long.valueOf(mediaId));
+        Uri uri = ContentUris.withAppendedId(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, Long.valueOf(mediaId));
 
-        String filePath = getPathFromUri(mUri);
+        String filePath = getPathFromUri(uri);
 
         // nullなら、Audioとしてパスを取得
         if (filePath == null) {
-            mUri = ContentUris.withAppendedId(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, Long.valueOf(mediaId));
-            filePath = getPathFromUri(mUri);
+            uri = ContentUris.withAppendedId(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, Long.valueOf(mediaId));
+            filePath = getPathFromUri(uri);
         }
 
         // ファイル存在チェック
@@ -248,6 +248,7 @@ public void putMediaId(final Intent response, final String mediaId) {
         }
 
         String mMineType = getMIMEType(filePath);
+        FileDescriptor fd = getDescriptorFromUri(uri);
 
         // パス指定の場合
         if (AUDIO_TYPE_LIST.contains(mMineType)) {
@@ -260,11 +261,11 @@ public void putMediaId(final Intent response, final String mediaId) {
 
             try {
                 mSetMediaType = MEDIA_TYPE_MUSIC;
-                mMyCurrentUri = mUri;
+                mMyCurrentUri = uri;
                 mMyCurrentFilePath = filePath;
                 mMyCurrentFileMIMEType = mMineType;
                 mMediaStatus = MEDIA_PLAYER_SET;
-                mMediaPlayer.setDataSource(filePath);
+                mMediaPlayer.setDataSource(fd);
                 mMediaPlayer.setOnCompletionListener((mp) -> {
                     mMediaStatus = MEDIA_PLAYER_COMPLETE;
                     sendOnStatusChangeEvent("complete");
@@ -290,7 +291,7 @@ public void putMediaId(final Intent response, final String mediaId) {
         } else if (VIDEO_TYPE_LIST.contains(mMineType)) {
             try {
                 mSetMediaType = MEDIA_TYPE_VIDEO;
-                mMyCurrentUri = mUri;
+                mMyCurrentUri = uri;
                 mMyCurrentFilePath = filePath;
                 mMyCurrentFileMIMEType = mMineType;
 
@@ -304,7 +305,7 @@ public void putMediaId(final Intent response, final String mediaId) {
                 FileInputStream fis;
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    ParcelFileDescriptor descriptor = getContentResolver().openFileDescriptor(mUri, "r");
+                    ParcelFileDescriptor descriptor = getContentResolver().openFileDescriptor(uri, "r");
                     fis = new ParcelFileDescriptor.AutoCloseInputStream(descriptor);
                 } else {
                     fis = new FileInputStream(mMyCurrentFilePath);
@@ -783,6 +784,19 @@ public void getPlayStatus(final Intent response) {
         }
     }
 
+    private FileDescriptor getDescriptorFromUri(final Uri uri) {
+        ContentResolver resolver = getContentResolver();
+        try {
+            ParcelFileDescriptor descriptor =  resolver.openFileDescriptor(uri, "r");
+            if (descriptor == null) {
+                return null;
+            }
+            return descriptor.getFileDescriptor();
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
     /**
      * URIからパスを取得.
      *