summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorSandeep Kunta <skunta@codeaurora.org>2014-09-01 17:21:05 +0530
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:28:18 -0600
commit2f7270f2add532423ba4afe14518a24fdc32d7a0 (patch)
treec7a8365f5eb6f3a042581cce50a7dc90f2867be7 /media
parent551189e78d24402f2f4739b1e258d028c05351f4 (diff)
downloadframeworks_base-2f7270f2add532423ba4afe14518a24fdc32d7a0.zip
frameworks_base-2f7270f2add532423ba4afe14518a24fdc32d7a0.tar.gz
frameworks_base-2f7270f2add532423ba4afe14518a24fdc32d7a0.tar.bz2
MSIM: Add support for DSDA.
1. Interface changes to inform local call hold and setActiveSubscription to telephony service from telecomm service. 2. Interface in Telecomm manager to query active subscription and switch to other subscription. 3. Add support in PhoneAccount to maintain LCH & active subscription information. 4. Interface changes to inform sub switch between inCallUI and Telecomm service. Change-Id: I942122eab45a19ea30abc92c90228d9115c1df78
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/ToneGenerator.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/media/java/android/media/ToneGenerator.java b/media/java/android/media/ToneGenerator.java
index 4661226..05e4471 100644
--- a/media/java/android/media/ToneGenerator.java
+++ b/media/java/android/media/ToneGenerator.java
@@ -728,13 +728,24 @@ public class ToneGenerator
* @see #ToneGenerator(int, int)
*/
public static final int TONE_CDMA_SIGNAL_OFF = 98;
+ /**
+ * SUPERVISORY_CH - 440Hz
+ *
+ * @hide #ToneGenerator(int, int)
+ */
+ public static final int TONE_SUPERVISORY_CH = 100;
+ /**
+ * HOLD_RECALL - 440Hz
+ *
+ * @hide #ToneGenerator(int, int)
+ */
+ public static final int TONE_HOLD_RECALL = 101;
/** Maximum volume, for use with {@link #ToneGenerator(int,int)} */
public static final int MAX_VOLUME = 100;
/** Minimum volume setting, for use with {@link #ToneGenerator(int,int)} */
public static final int MIN_VOLUME = 0;
-
/**
* ToneGenerator class contructor specifying output stream type and volume.
*