commit c9f43e9140f13e8d0ab1426c578ad82632808aac
author Sandeep Kunta <skunta@codeaurora.org> Fri Sep 12 10:55:09 2014 +0530
committer Linux Build Service Account <lnxbuild@localhost> Tue Nov 04 08:36:25 2014 -0700
tree cb85cfc516b51a175b5562fa1d0b9af4a4c2ceba
parent 0f8bfc501f8a2f4b893ee11e47f3fccf57708b4e

MSIM(DSDA): Keep the tone ids consistent with Audio module

Keep tone ids of TONE_LOCAL_CW, TONE_SUPERVISORY_CH & TONE_HOLD_RECALL
consistant with audio module to avoid mismatch of tone id values
between telephony & audio.

Change-Id: I9911c0e5c71b16120bf49d172c6fa69581202247
CRs-Fixed: 720550

media/java/android/media/ToneGenerator.java

diff --git a/media/java/android/media/ToneGenerator.java b/media/java/android/media/ToneGenerator.java
index 72e7cad..a1630fe 100644
--- a/media/java/android/media/ToneGenerator.java
+++ b/media/java/android/media/ToneGenerator.java
@@ -729,17 +729,23 @@
      */
     public static final int TONE_CDMA_SIGNAL_OFF = 98;
     /**
+     * LOCAL_CW - 440Hz
+     *
+     * @hide #ToneGenerator(int, int)
+     */
+    public static final int TONE_LOCAL_CW = 99;
+    /**
      * SUPERVISORY_CH - 440Hz
      *
      * @hide #ToneGenerator(int, int)
      */
-    public static final int TONE_SUPERVISORY_CH = 99;
+    public static final int TONE_SUPERVISORY_CH = 100;
     /**
      * HOLD_RECALL - 440Hz
      *
      * @hide #ToneGenerator(int, int)
      */
-    public static final int TONE_HOLD_RECALL = 100;
+    public static final int TONE_HOLD_RECALL = 101;
 
     /** Maximum volume, for use with {@link #ToneGenerator(int,int)} */
     public static final int MAX_VOLUME = 100;