summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJosh Guilfoyle <Josh.Guilfoyle@T-Mobile.com>2009-11-30 16:39:19 -0800
committerJosh Guilfoyle <Josh.Guilfoyle@T-Mobile.com>2009-11-30 16:52:46 -0800
commitcd1a2e3ac30eb0a1d0880c1fc703d702e6bc94e3 (patch)
tree5d0d575a512905680d4fb26b6b55b65a0447ffa4 /media
parent65fae3511c240c4620480fe44fa50de18ccce145 (diff)
downloadframeworks_base-cd1a2e3ac30eb0a1d0880c1fc703d702e6bc94e3.zip
frameworks_base-cd1a2e3ac30eb0a1d0880c1fc703d702e6bc94e3.tar.gz
frameworks_base-cd1a2e3ac30eb0a1d0880c1fc703d702e6bc94e3.tar.bz2
ESPRESSO-182: Fixed theme ringtone from playing back during incoming call.
This issue was two part: one, the check for the package resources provider authority was in the wrong place (needed to be in openAssetFile, not openFile). And two, the openAssetFile implementation was calling openFileDescriptor and wrapping, preventing actual asset fds from working properly. CR: Ed Carrigan
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/RingtoneManager.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index dcbc83c..15f99d3 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -191,7 +191,10 @@ public class RingtoneManager {
public static final String EXTRA_RINGTONE_PICKED_URI =
"android.intent.extra.ringtone.PICKED_URI";
- static final String THEME_AUTHORITY = "com.tmobile.thememanager.packageresources";
+ /**
+ * @hide
+ */
+ public static final String THEME_AUTHORITY = "com.tmobile.thememanager.packageresources";
// Make sure the column ordering and then ..._COLUMN_INDEX are in sync