Merge commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b'
* commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b':
Update comment in mediaplayer.h.
Update documentation for getVideoWidth and getVideoHeight.
Make Uri.parseUserPart, parseHost, and parsePort symmetric
Javadoc used startApplication() which doesnt exists, changed to createApplication()
Merge commit 'dc2aab4ff2afbb414549a0311d46765e62c225be' into eclair-plus-aosp
* commit 'dc2aab4ff2afbb414549a0311d46765e62c225be':
Fix the zoom center. Now there is a titlebar, the zoom center
Merge commit '323034827f9673df17481397a35aceba382a1e4e'
* commit '323034827f9673df17481397a35aceba382a1e4e':
First pass at pattern lock screen that includes date / time and carrier info (andoid.policy portion)
* changes:
Fix the zoom center. Now there is a titlebar, the zoom center needs to be adjusted for it as the user really cares the spot in the document. We need to pin zoom around that spot.
Merge commit '3065a3cad069b847165c99a38a251c072950d07f' into eclair-plus-aosp
* commit '3065a3cad069b847165c99a38a251c072950d07f':
Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
Issue: While in emergency mode, if we receive a message, there is a notification
being shown as "Text Message rejected".
Fix: In CdmaSMSDispatcher.java, send RESULT_OK response instead of RESULT_SMS_GENERIC_ERROR
for messages during Emergency mode. So, that SMS_REJECTED action is not broadcasted.
If the result is RESULT_OK from CdmaSMSDispatcher, the function notifyAndAcknowledgeLastIncomingSms()
is not called from SMSDispatcher.java and hence SMS_REJECTED_ACTION intent is not broadcast.
Consequently SMSRejectReceiver.java will not receive the broadcast and will not show reject
notification.
Change-Id: I2aa8f239393b3e6eeac6b0c2bb69799018e9ae9d
Merge commit 'c2912a662d984e2f23187fa31e7e71122d9472d9' into eclair-plus-aosp
* commit 'c2912a662d984e2f23187fa31e7e71122d9472d9':
Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
Merge commit 'dfe095a045f132dd9c75da4286b87532d9a973a0' into eclair-plus-aosp
* commit 'dfe095a045f132dd9c75da4286b87532d9a973a0':
Don't change the zoom filter during the zoom animation.
Call another invalidate() to draw with the final filters.
This fixed the problem where the end of the zoom animation
is slow and jagged.
Fix http://b/issue?id=2126523
Merge commit '6c41feadc30448adba4f771b3c1b4ecda8d875b6' into eclair-plus-aosp
* commit '6c41feadc30448adba4f771b3c1b4ecda8d875b6':
LocationManagerService: Take fix accuracy into account in proximity zone logic.
In some cases a sms acknowledgement might be lost. The network will then resend
the same sms. These duplicate sms should be acknowledged but not shown to the
user.
C.S0015-B 4.3.1.6 Unique Message Identification.
The fields used to identify a message are:
* Message Identifier,
* Originating Address,
* Originating Subaddress, and
* Message Center Time Stamp.
Since some of the fields are optional, the Teleservice Layer shall use as
many of the fields as are present in the SMS message to determine message
uniqueness. Mobile stations should discard repeated messages.
1. Add a fingerprint function to SmsMessage.java. This returns a byte array
to be used as a unique identifier. Parts that make up the identifier are
the originating address, teleservice id and the bearerdata. Using all of
the bearerdata saves parsing time. There are no random bits allowed in
the standard. This makes binary comparison possible. Using all of the
bearerdata accounts for the message id, smsc timestamp and "... shall
use as many of the fields as are present in the SMS message".
2. Have CdmaSMSDispatcher.dispatchMessage() pull a fingerprint and check if
it matches the last acknowledged fingerprint. When it matches return and
signal that message was handled.
3. Have CdmaSMSDispatcher.acknowledgeLastIncomingSms() take the last
dispatched fingerprint move it to the last acknowledged fingerprint.
Only do this if processing of the sms was successful.
Change-Id: If79f8fe40896cd290940b7ccd5a17531ab937b60
Merge commit '2f77ffb087892f9474b35cb019f593025653e492' into eclair-plus-aosp
* commit '2f77ffb087892f9474b35cb019f593025653e492':
Don't crash if the cursor is null.
Merge commit 'f7c98e8d1827510a90699b4641eb1937d2e0b823' into eclair-plus-aosp
* commit 'f7c98e8d1827510a90699b4641eb1937d2e0b823':
Wire the rest of MediaPlayer to our implementation of WebCore::MediaPlayerPrivate
Merge commit 'ea8844811d1b0965f5c2f43006c0a08bcd73f23a'
* commit 'ea8844811d1b0965f5c2f43006c0a08bcd73f23a':
Added a field to track if the call is to a voicemail instance.
Merge commit '20158b9ce5895fdbdedf5db103583264d94a62a4'
* commit '20158b9ce5895fdbdedf5db103583264d94a62a4':
slide the title if the site changes the scroll position
Merge commit '0c2289053127e43e517ff8cc096d691c15279fed'
* commit '0c2289053127e43e517ff8cc096d691c15279fed':
Refactor logic for starting forward servers and http test cases hacking, so that they can be shared between automated test mode and UI launch mode.
Merge commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b'
* commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b':
Add support for launching activities when attaching to a car or desk dock.
Merge commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18'
* commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18':
Combine the "Permission Requested" title and subtitle into one string.
Merge commit 'fc1a365740478f61e671fe669fc466a9a753f031'
* commit 'fc1a365740478f61e671fe669fc466a9a753f031':
Add new Gservices setting for discarding uphill ops for eclair and future devices.
Merge commit 'f324b2b0fcc15834fd944adf6afe95d1e5bc6d0a'
* commit 'f324b2b0fcc15834fd944adf6afe95d1e5bc6d0a':
Use separate resources to control orientation change for car and desk docks.
Merge commit 'e39a8dbd6b0c4249d9ecbf35f9999d1e4764457c'
* commit 'e39a8dbd6b0c4249d9ecbf35f9999d1e4764457c':
Allow specifying separate orientation rotations for car and desk dock.
Merge commit 'a78a157905ae49a170b0e2239df96b1f365f646d'
* commit 'a78a157905ae49a170b0e2239df96b1f365f646d':
Don't scroll on load if titlebar is visible
