diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2015-07-01 16:20:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-01 16:20:35 +0000 |
| commit | 8a7c1d87138c02cdd823fd926d5c4a31fd39db5c (patch) | |
| tree | de954ff3e3bda91c7bacd0e26ee45ae61204205c | |
| parent | ea37fdecc39ae59e78bfa423fb79e3b2b1ec7e33 (diff) | |
| parent | 1d48d5a992c32d37bc9535686d96569680639cfa (diff) | |
| download | packages_providers_ContactsProvider-8a7c1d87138c02cdd823fd926d5c4a31fd39db5c.zip packages_providers_ContactsProvider-8a7c1d87138c02cdd823fd926d5c4a31fd39db5c.tar.gz packages_providers_ContactsProvider-8a7c1d87138c02cdd823fd926d5c4a31fd39db5c.tar.bz2 | |
am 1d48d5a9: Copy ringtone uri when rewriting cursor from corp profile.
* commit '1d48d5a992c32d37bc9535686d96569680639cfa':
Copy ringtone uri when rewriting cursor from corp profile.
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index a7595e4..02e9c52 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -104,6 +104,8 @@ import android.provider.ContactsContract.Settings; import android.provider.ContactsContract.StatusUpdates; import android.provider.ContactsContract.StreamItemPhotos; import android.provider.ContactsContract.StreamItems; +import android.provider.MediaStore; +import android.provider.MediaStore.Audio.Media; import android.provider.OpenableColumns; import android.provider.Settings.Global; import android.provider.SyncStateContract; @@ -6728,9 +6730,19 @@ public class ContactsProvider2 extends AbstractContactsProvider break; case Data.PHOTO_FILE_ID: case Data.PHOTO_ID: - case Data.CUSTOM_RINGTONE: builder.add(null); break; + case Data.CUSTOM_RINGTONE: + String ringtoneUri = original.getString(originalColumnIndex); + // TODO: Remove this conditional block once accessing sounds in corp + // profile becomes possible. + if (ringtoneUri != null + && !Uri.parse(ringtoneUri).isPathPrefixMatch( + MediaStore.Audio.Media.INTERNAL_CONTENT_URI)) { + ringtoneUri = null; + } + builder.add(ringtoneUri); + break; case Contacts.LOOKUP_KEY: final String lookupKey = original.getString(originalColumnIndex); if (TextUtils.isEmpty(lookupKey)) { |