summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ian Baker <ibaker@google.com> 2024-01-22 12:28:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-22 12:28:07 +0000
commitb82529c9e04432c6fa52a6eb687a1d52da3cfaa8 (patch)
tree7a3c771036c8ffaed2ce2a7a2efaeda675c19016
parent652bbce30e44de732cc34d3bb7a2b66852ec39bc (diff)
parent363f916a330a7c2aa2284223857fa87c91e36a7f (diff)
Merge "Log exception when MediaPlayer.attemptDataSource fails" into main am: 0cf60fb242 am: 363f916a33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2919925 Change-Id: I112860b3a2fd3c8e00dfec24723899c7683e7038 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 8e9c07996f83..a0f8ae5defeb 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1154,6 +1154,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;
}
}