summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ian Baker <ibaker@google.com> 2024-01-22 11:48:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-22 11:48:06 +0000
commit363f916a330a7c2aa2284223857fa87c91e36a7f (patch)
tree099f0eaf4b9b3a0306f7f762ca34842a628e9cc3
parent991b09c6b55b057f17607da6b7223e1fb04b9bca (diff)
parent0cf60fb242ee7a634656091377531efe06347446 (diff)
Merge "Log exception when MediaPlayer.attemptDataSource fails" into main am: 0cf60fb242
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2919925 Change-Id: I5c997b7aa95049db3b67b34cd670a5637e10c606 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--media/java/android/media/MediaPlayer.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 1ee5aa36740c..0d9acf22071b 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1156,6 +1156,7 @@ public class MediaPlayer extends PlayerBase
setDataSource(afd);
return true;
} catch (NullPointerException | SecurityException | IOException ex) {
+ Log.w(TAG, "Error setting data source via ContentResolver", ex);
return false;
}
}