Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 9524

Browse Source 
* changes:
  Fix WPS Queued pip tone not working issue.
This commit is contained in:
Android (Google) Code Review
2009-08-03 12:47:59 -07:00
parent 637854c9b5 dfb8f07a95
commit 5d10146362
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
telephony/java/com/android/internal/telephony/cdma/SignalToneUtil.java
View File

@@ -35,7 +35,12 @@ public class SignalToneUtil {
static public final int IS95_CONST_IR_ALERT_MED = 0;
static public final int IS95_CONST_IR_ALERT_HIGH = 1;
static public final int IS95_CONST_IR_ALERT_LOW = 2;
static public final int TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN = 255;
// Based on 3GPP2 C.S0005-E, seciton 3.7.5.5 Signal,
// set TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN to 0 to avoid
// the alert pitch to be involved in hash calculation for
// signal type other than IS54B.
static public final int TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN = 0;
// public final int int IS95_CONST_IR_SIGNAL_TYPE;
static public final int IS95_CONST_IR_SIG_ISDN_NORMAL = 0;
@@ -81,6 +86,15 @@ public class SignalToneUtil {
(alertPitch < 0) || (signal > 256) || (signal < 0)) {
return new Integer(CDMA_INVALID_TONE);
}
// Based on 3GPP2 C.S0005-E, seciton 3.7.5.5 Signal,
// the alert pitch field is ignored by the mobile station unless
// SIGNAL_TYPE is '10',IS-54B Alerting.
// Set alert pitch to TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN
// so the alert pitch is not involved in hash calculation
// when signal type is not IS-54B.
if (signalType != IS95_CONST_IR_SIGNAL_IS54B) {
alertPitch = TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN;
}
return new Integer(signalType * 256 * 256 + alertPitch * 256 + signal);
}