diff options
author | Justin Klaassen <justinklaassen@google.com> | 2015-11-11 18:30:23 -0800 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2015-11-11 18:30:23 -0800 |
commit | cbb9333b9277b50866cab8d4870a3aa8f705494d (patch) | |
tree | df42fda0cbc81f133addef601aa3b8bc457f9352 /res | |
parent | e100e102b001ea0a61b079b1aa1b766d10504501 (diff) | |
download | android_packages_apps_DeskClock-cbb9333b9277b50866cab8d4870a3aa8f705494d.tar.gz android_packages_apps_DeskClock-cbb9333b9277b50866cab8d4870a3aa8f705494d.tar.bz2 android_packages_apps_DeskClock-cbb9333b9277b50866cab8d4870a3aa8f705494d.zip |
Fallback to internal alarm ringtone if necessary
Bug: 25177293
If the default system alarm ringtone is invalid or malformed then
RingtoneManager will return a null Ringtone. In which case we now
fallback to playing our own internal alarm ringtone.
Change-Id: I1beeec0fc8998ad684e67062ffc0fd0d03f66f68
Diffstat (limited to 'res')
-rw-r--r-- | res/raw/alarm_expire.ogg (renamed from res/raw/fallbackring.ogg) | bin | 21153 -> 21174 bytes |
-rw-r--r-- | res/raw/in_call_alarm.ogg | bin | 21153 -> 0 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/res/raw/fallbackring.ogg b/res/raw/alarm_expire.ogg Binary files differindex 9d8003776..316e77e39 100644 --- a/res/raw/fallbackring.ogg +++ b/res/raw/alarm_expire.ogg diff --git a/res/raw/in_call_alarm.ogg b/res/raw/in_call_alarm.ogg Binary files differdeleted file mode 100644 index 9d8003776..000000000 --- a/res/raw/in_call_alarm.ogg +++ /dev/null |