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
The fix consists in locking AudioFlinger::mLock mutex in the TrackBase destructor before clearing the strong pointer to the shared memory client. The mutex is not locked in removeclient() any more which implies that we must make sure that the Client destructor is always called from the TrackBase destructor or that we hold the mLock mutex before calling deleting the Client.
Merge commit '074c11c1649a097ba1beae719069f8d4a2dd43e3' into eclair-plus-aosp
* commit '074c11c1649a097ba1beae719069f8d4a2dd43e3':
Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
Merge commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296' into eclair-plus-aosp
* commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296':
Add a null checking to avoid crash.
Merge commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3' into eclair-plus-aosp
* commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3':
do not merge. Revert "do not merge. Remove voicesearch-specific functionality from framework."
Merge commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017' into eclair-plus-aosp
* commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017':
Make ACTV use all available space if height is FILL_PARENT.
Merge commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0' into eclair-plus-aosp
* commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0':
Poster support on the Java side
Merge commit 'f8c90acd7fde806d2d9cccf4d6ec52dc279497bc' into eclair-plus-aosp
* commit 'f8c90acd7fde806d2d9cccf4d6ec52dc279497bc':
Only move to the next test in DRT after the test has completed AND the page has finished loading.
Merge commit 'f5a68512c3d0624584c3e6da1523863e401e49d0' into eclair-plus-aosp
* commit 'f5a68512c3d0624584c3e6da1523863e401e49d0':
First pass at pattern lock screen that includes date / time and carrier info (framework portion).
Merge commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669' into eclair-plus-aosp
* commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669':
add basic time stats for surfaces lock time
Merge commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c' into eclair-plus-aosp
* commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c':
Handle BACK key with focus in search ACTV correctly
Merge commit '74f79c1b2215525f8171551812b014bdb7cfba04' into eclair-plus-aosp
* commit '74f79c1b2215525f8171551812b014bdb7cfba04':
Fix a minor bug in is_alnum_string()...
Merge commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6' into eclair-plus-aosp
* commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6':
remove the signin required notification as when the signin is successful
Merge commit 'e38212a22f900468cc4a888b896bee99e1c29a1d' into eclair-plus-aosp
* commit 'e38212a22f900468cc4a888b896bee99e1c29a1d':
Overlay could not set position or rotation immediately after created, it should be triggered by signalEvent().
Merge commit 'a6aca3e094719b181c9858aa57d6c2160c5cb16a' into eclair-plus-aosp
* commit 'a6aca3e094719b181c9858aa57d6c2160c5cb16a':
disable backbuffer preservation when possible, which may improve performance a bit
Merge commit '81521abea121683643cedbb7483a9a7eb0e466ae' into eclair-plus-aosp
* commit '81521abea121683643cedbb7483a9a7eb0e466ae':
Add "MMS" to common phone number types.
Merge commit '12cc9d82a6f3bd2aebad8ed97a29e2cbad3ec77a' into eclair-plus-aosp
* commit '12cc9d82a6f3bd2aebad8ed97a29e2cbad3ec77a':
Add a new flag for IMEs to disable suggestions for certain fields.
Merge commit 'b8eb1cb79b2912b91a1b0198ba3e61776af07a79' into eclair-plus-aosp
* commit 'b8eb1cb79b2912b91a1b0198ba3e61776af07a79':
Be sure to include shared lib path info when dealing with agents
Merge commit '972f0e3806f379b7fb6e43265f56ddd91c38107e' into eclair-plus-aosp
* commit '972f0e3806f379b7fb6e43265f56ddd91c38107e':
Add a parcelable version of UUID file.
Merge commit 'd9497f7dd98da28da320ac2231c6e94a243ce257' into eclair-plus-aosp
* commit 'd9497f7dd98da28da320ac2231c6e94a243ce257':
Add StateListDrawable's dither flag to the constant state.
