summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-02-03 12:10:37 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-02-03 12:10:37 +0100
commitd4590dda7776ec99e4e879c47b3372a5f4b13dcd (patch)
tree5319f997c7cd31d610ce5ed80c847bd7d6d043fa /include/media
parent998f3a696f0d671832624637c771e3bda3e0c9f5 (diff)
parentfda1413978cabfafdf184c02aa20d2fd8c095616 (diff)
downloadframeworks_av-d4590dda7776ec99e4e879c47b3372a5f4b13dcd.zip
frameworks_av-d4590dda7776ec99e4e879c47b3372a5f4b13dcd.tar.gz
frameworks_av-d4590dda7776ec99e4e879c47b3372a5f4b13dcd.tar.bz2
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0
Diffstat (limited to 'include/media')
-rw-r--r--include/media/ToneGenerator.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h
index 8406ed6..0043bdc 100644
--- a/include/media/ToneGenerator.h
+++ b/include/media/ToneGenerator.h
@@ -148,6 +148,8 @@ public:
TONE_CDMA_ABBR_ALERT,
TONE_CDMA_SIGNAL_OFF,
//CDMA end
+ TONE_HOLD_RECALL,
+
NUM_TONES,
NUM_SUP_TONES = LAST_SUP_TONE-FIRST_SUP_TONE+1
};