Merge change I4ad9ec48 into eclair-mr2
* changes:
Fix A2dpAudioInterface getParameters.
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 77943d8..3207c79 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4787,7 +4787,7 @@
}
/**
- * Do a touch up from a WebTextView. This will be handled by webkit to
+ * Due a touch up from a WebTextView. This will be handled by webkit to
* change the selection.
* @param event MotionEvent in the WebTextView's coordinates.
*/
@@ -4797,10 +4797,7 @@
}
int x = viewToContentX((int) event.getX() + mWebTextView.getLeft());
int y = viewToContentY((int) event.getY() + mWebTextView.getTop());
- if (nativeFocusNodePointer() != nativeCursorNodePointer()) {
- nativeMotionUp(x, y, mNavSlop);
- }
- nativeTextInputMotionUp(x, y);
+ nativeMotionUp(x, y, mNavSlop);
}
/**
@@ -5941,12 +5938,6 @@
private native void nativeSetHeightCanMeasure(boolean measure);
// Returns a value corresponding to CachedFrame::ImeAction
/* package */ native int nativeTextFieldAction();
- /**
- * Perform a click on a currently focused text input. Since it is already
- * focused, there is no need to go through the nativeMotionUp code, which
- * may change the Cursor.
- */
- private native void nativeTextInputMotionUp(int x, int y);
private native int nativeTextGeneration();
// Never call this version except by updateCachedTextfield(String) -
// we always want to pass in our generation number.
diff --git a/telephony/java/com/android/internal/telephony/cdma/SignalToneUtil.java b/telephony/java/com/android/internal/telephony/cdma/SignalToneUtil.java
index 4b88057..a149e72 100644
--- a/telephony/java/com/android/internal/telephony/cdma/SignalToneUtil.java
+++ b/telephony/java/com/android/internal/telephony/cdma/SignalToneUtil.java
@@ -167,7 +167,7 @@
IS95_CONST_IR_SIG_TONE_ANSWER), ToneGenerator.TONE_CDMA_ANSWER);
hm.put(signalParamHash(IS95_CONST_IR_SIGNAL_TONE, TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN,
- IS95_CONST_IR_SIG_TONE_ABB_RE), ToneGenerator.TONE_CDMA_NETWORK_CALLWAITING);
+ IS95_CONST_IR_SIG_TONE_CALL_W), ToneGenerator.TONE_CDMA_NETWORK_CALLWAITING);
hm.put(signalParamHash(IS95_CONST_IR_SIGNAL_TONE, TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN,
IS95_CONST_IR_SIG_TONE_PIP), ToneGenerator.TONE_CDMA_PIP);