Commit Graph

5113 Commits

Author SHA1 Message Date
Android (Google) Code Review
187cc0cd44 Merge change 25534 into eclair
* changes:
  Message Reject notification shouldn't be shown in Emergency Calling Mode
2009-09-17 15:03:27 -04:00
Android (Google) Code Review
44860cb6b9 Merge change 25524 into eclair
* 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.
2009-09-17 15:02:16 -04:00
Christian Gustafsson
0ae56bb7f8 am 8460be7a: Merge change 25535 into eclair
Merge commit '8460be7a57117d786adf2e1233ef02c4e96f0030' into eclair-plus-aosp

* commit '8460be7a57117d786adf2e1233ef02c4e96f0030':
  CDMA Check for network duplicate sms
2009-09-17 12:00:52 -07:00
Andreas Huber
f7af3d39e7 am 3065a3ca: Merge change 25528 into eclair
Merge commit '3065a3cad069b847165c99a38a251c072950d07f' into eclair-plus-aosp

* commit '3065a3cad069b847165c99a38a251c072950d07f':
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
2009-09-17 12:00:45 -07:00
Android (Google) Code Review
45aa55cfd1 Merge change 25535 into eclair
* changes:
  CDMA Check for network duplicate sms
2009-09-17 14:53:45 -04:00
Android (Google) Code Review
d6783b6642 Merge change 25528 into eclair
* changes:
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
2009-09-17 14:46:45 -04:00
Mike Lockwood
57c2bba520 am c2912a66: Merge change 25490 into eclair
Merge commit 'c2912a662d984e2f23187fa31e7e71122d9472d9' into eclair-plus-aosp

* commit 'c2912a662d984e2f23187fa31e7e71122d9472d9':
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
2009-09-17 11:45:25 -07:00
Grace Kloba
e68b17505f am dfe095a0: 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.
Merge commit 'dfe095a045f132dd9c75da4286b87532d9a973a0' into eclair-plus-aosp

* commit 'dfe095a045f132dd9c75da4286b87532d9a973a0':
  Don't change the zoom filter during the zoom animation.
2009-09-17 11:40:41 -07:00
Android (Google) Code Review
fa564a52af Merge change 25490 into eclair
* changes:
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
2009-09-17 14:39:43 -04:00
Jack Palevich
4908186950 am 78059337: Merge change 25523 into eclair
Merge commit '7805933738de33b1961bd03553237a86d90792dd' into eclair-plus-aosp

* commit '7805933738de33b1961bd03553237a86d90792dd':
  Add additional error checking, exit early if errors occur.
2009-09-17 11:06:54 -07:00
Android (Google) Code Review
2e8693aae3 Merge change 25523 into eclair
* changes:
  Add additional error checking, exit early if errors occur.
2009-09-17 14:02:06 -04:00
Yusuf T. Mobile
e5e5fb94b7 am 6c41fead: Merge change 25519 into eclair
Merge commit '6c41feadc30448adba4f771b3c1b4ecda8d875b6' into eclair-plus-aosp

* commit '6c41feadc30448adba4f771b3c1b4ecda8d875b6':
  LocationManagerService: Take fix accuracy into account in proximity zone logic.
2009-09-17 11:02:05 -07:00
Debajit Ghosh
c9486cf733 am 70db3a20: Merge change 25414 into eclair
Merge commit '70db3a20cfa73fad0794679dda4102461a88057b' into eclair-plus-aosp

* commit '70db3a20cfa73fad0794679dda4102461a88057b':
  refactor copy-and-paste email address filtering code.
2009-09-17 11:01:57 -07:00
Jack Palevich
058777592d Add additional error checking, exit early if errors occur. 2009-09-17 10:59:23 -07:00
Android (Google) Code Review
b70aab591e Merge change 25519 into eclair
* changes:
  LocationManagerService: Take fix accuracy into account in proximity zone logic.
2009-09-17 13:58:20 -04:00
Android (Google) Code Review
41290b6bf0 Merge change 25414 into eclair
* changes:
  refactor copy-and-paste email address filtering code. add a column to Calendar.Events contract class.
2009-09-17 13:53:37 -04:00
Marco Nelissen
82fd8849b0 am 94ef4991: Merge change 25502 into eclair
Merge commit '94ef49918240cedaa559ad7f7752d20cf4d1668b' into eclair-plus-aosp

* commit '94ef49918240cedaa559ad7f7752d20cf4d1668b':
  Fix typo
2009-09-17 10:23:32 -07:00
Jeff Hamilton
bc6c5a7105 am 2f77ffb0: Merge change 25503 into eclair
Merge commit '2f77ffb087892f9474b35cb019f593025653e492' into eclair-plus-aosp

* commit '2f77ffb087892f9474b35cb019f593025653e492':
  Don't crash if the cursor is null.
2009-09-17 10:23:21 -07:00
Android (Google) Code Review
83d9dc5dcd Merge change 25502 into eclair
* changes:
  Fix typo
2009-09-17 13:17:55 -04:00
Android (Google) Code Review
a9c0ce0f71 Merge change 25503 into eclair
* changes:
  Don't crash if the cursor is null.
2009-09-17 13:07:04 -04:00
Andrei Popescu
527f3b1dc8 am f7c98e8d: Merge change 25493 into eclair
Merge commit 'f7c98e8d1827510a90699b4641eb1937d2e0b823' into eclair-plus-aosp

* commit 'f7c98e8d1827510a90699b4641eb1937d2e0b823':
  Wire the rest of MediaPlayer to our implementation of WebCore::MediaPlayerPrivate
2009-09-17 10:00:03 -07:00
Android (Google) Code Review
d6050dc23b Merge change 25493 into eclair
* changes:
  Wire the rest of MediaPlayer to our implementation of WebCore::MediaPlayerPrivate
2009-09-17 12:52:59 -04:00
Eric Laurent
0f8ab670c0 Fix issue 2127371: Possible race condition in AudioFlinger::openRecord() when a Track is being destroyed.
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.
2009-09-17 09:26:04 -07:00
Nick Pelly
ad335fa500 am 074c11c1: Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
Merge commit '074c11c1649a097ba1beae719069f8d4a2dd43e3' into eclair-plus-aosp

* commit '074c11c1649a097ba1beae719069f8d4a2dd43e3':
  Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
2009-09-17 08:53:07 -07:00
Grace Kloba
fd3d03206f am ff22b182: Merge change 25401 into eclair
Merge commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296' into eclair-plus-aosp

* commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296':
  Add a null checking to avoid crash.
2009-09-17 08:48:53 -07:00
Alex Gruenstein
f12c6d42d3 am 4b6a278c: Merge change 25366 into eclair
Merge commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3' into eclair-plus-aosp

* commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3':
  do not merge.  Revert "do not merge.  Remove voicesearch-specific functionality from framework."
2009-09-17 08:48:45 -07:00
Bryan Mawhinney
70e555abdf am c7aef5d0: Merge change 25477 into eclair
Merge commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017' into eclair-plus-aosp

* commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017':
  Make ACTV use all available space if height is FILL_PARENT.
2009-09-17 08:48:31 -07:00
Andrei Popescu
d7501a31e5 am b65c5cf0: Merge change 25098 into eclair
Merge commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0' into eclair-plus-aosp

* commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0':
  Poster support on the Java side
2009-09-17 08:48:00 -07:00
Ben Murdoch
44b3e30fb5 am f8c90acd: Merge change 25319 into eclair
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.
2009-09-17 08:47:53 -07:00
Karl Rosaen
b702558c29 am f5a68512: Merge change 25463 into eclair
Merge commit 'f5a68512c3d0624584c3e6da1523863e401e49d0' into eclair-plus-aosp

* commit 'f5a68512c3d0624584c3e6da1523863e401e49d0':
  First pass at pattern lock screen that includes date / time and carrier info (framework portion).
2009-09-17 08:47:32 -07:00
Mathias Agopian
cd0af461b0 am bcef9ac3: add basic time stats for surfaces lock time
Merge commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669' into eclair-plus-aosp

* commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669':
  add basic time stats for surfaces lock time
2009-09-17 08:47:04 -07:00
Bjorn Bringert
7391d6f467 am 76f01118: Merge change 25362 into eclair
Merge commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c' into eclair-plus-aosp

* commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c':
  Handle BACK key with focus in search ACTV correctly
2009-09-17 08:46:57 -07:00
Hung-ying Tyan
bd098b3d9c am 74f79c1b: Merge change 25440 into eclair
Merge commit '74f79c1b2215525f8171551812b014bdb7cfba04' into eclair-plus-aosp

* commit '74f79c1b2215525f8171551812b014bdb7cfba04':
  Fix a minor bug in is_alnum_string()...
2009-09-17 08:46:39 -07:00
Fred Quintana
40acd105f3 am e9351608: Merge change 25406 into eclair
Merge commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6' into eclair-plus-aosp

* commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6':
  remove the signin required notification as when the signin is successful
2009-09-17 08:46:32 -07:00
Benny Wong
d388e6dcbd am e38212a2: Overlay could not set position or rotation immediately after created, it should be triggered by signalEvent(). Originally from: https://partner.source.android.com/g/#change,1074
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().
2009-09-17 08:45:42 -07:00
Mathias Agopian
b7791dafdd am a6aca3e0: Merge change 25435 into eclair
Merge commit 'a6aca3e094719b181c9858aa57d6c2160c5cb16a' into eclair-plus-aosp

* commit 'a6aca3e094719b181c9858aa57d6c2160c5cb16a':
  disable backbuffer preservation when possible, which may improve performance a bit
2009-09-17 08:45:34 -07:00
Jeff Sharkey
b141d030ba am 81521abe: Merge change 25431 into eclair
Merge commit '81521abea121683643cedbb7483a9a7eb0e466ae' into eclair-plus-aosp

* commit '81521abea121683643cedbb7483a9a7eb0e466ae':
  Add "MMS" to common phone number types.
2009-09-17 08:45:16 -07:00
Yu Shan Emily Lau
e0bc99b1d7 am c82e65ae: Merge change 25228 into eclair
Merge commit 'c82e65aed57592d40009a9695f513ebf402e687c' into eclair-plus-aosp

* commit 'c82e65aed57592d40009a9695f513ebf402e687c':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
2009-09-17 08:45:01 -07:00
Amith Yamasani
85c486ecff am 12cc9d82: Add a new flag for IMEs to disable suggestions for certain fields.
Merge commit '12cc9d82a6f3bd2aebad8ed97a29e2cbad3ec77a' into eclair-plus-aosp

* commit '12cc9d82a6f3bd2aebad8ed97a29e2cbad3ec77a':
  Add a new flag for IMEs to disable suggestions for certain fields.
2009-09-17 08:44:53 -07:00
Mathias Agopian
3adbdb1e84 am 75c4d498: Merge change 25423 into eclair
Merge commit '75c4d498776a189f37e3d0294c9eda9ed51f6534' into eclair-plus-aosp

* commit '75c4d498776a189f37e3d0294c9eda9ed51f6534':
  fix [2119400] sholes: artifacting when switching orientation
2009-09-17 08:44:32 -07:00
Christopher Tate
15f3323c37 am b8eb1cb7: Be sure to include shared lib path info when dealing with agents
Merge commit 'b8eb1cb79b2912b91a1b0198ba3e61776af07a79' into eclair-plus-aosp

* commit 'b8eb1cb79b2912b91a1b0198ba3e61776af07a79':
  Be sure to include shared lib path info when dealing with agents
2009-09-17 08:44:21 -07:00
Jaikumar Ganesh
6d30890c3f am cfc7f1aa: Merge change 25382 into eclair
Merge commit 'cfc7f1aaefa60f43e27969690a939f664ff1c678' into eclair-plus-aosp

* commit 'cfc7f1aaefa60f43e27969690a939f664ff1c678':
  Fix async calls with Connect And Disconnect Sink.
2009-09-17 08:43:56 -07:00
Robert Greenwalt
cb48273054 am 2f20df19: Merge change 25398 into eclair
Merge commit '2f20df194f9b5e58abc67998a556d3ab2d51ffaf' into eclair-plus-aosp

* commit '2f20df194f9b5e58abc67998a556d3ab2d51ffaf':
  Reintroduce wifi RssiApprox, reducing driver calls
2009-09-17 08:43:48 -07:00
Jaikumar Ganesh
b0fe9facbe am cc670b5c: Merge change 25323 into eclair
Merge commit 'cc670b5ca26e4a6ac8d34fa0ee0e51c895067c48' into eclair-plus-aosp

* commit 'cc670b5ca26e4a6ac8d34fa0ee0e51c895067c48':
  Change handling of remoteUuids.
2009-09-17 08:43:41 -07:00
Jaikumar Ganesh
36b6b68c56 am 972f0e38: Merge change 25325 into eclair
Merge commit '972f0e3806f379b7fb6e43265f56ddd91c38107e' into eclair-plus-aosp

* commit '972f0e3806f379b7fb6e43265f56ddd91c38107e':
  Add a parcelable version of UUID file.
2009-09-17 08:43:19 -07:00
Romain Guy
51a89a66fb am d9497f7d: Merge change 25394 into eclair
Merge commit 'd9497f7dd98da28da320ac2231c6e94a243ce257' into eclair-plus-aosp

* commit 'd9497f7dd98da28da320ac2231c6e94a243ce257':
  Add StateListDrawable's dither flag to the constant state.
2009-09-17 08:43:12 -07:00
Mathias Agopian
f5fc2c2bc7 am 9080125f: Merge change 25393 into eclair
Merge commit '9080125f6753ca830b091b0103759612036be786' into eclair-plus-aosp

* commit '9080125f6753ca830b091b0103759612036be786':
  fix again [2102410] Home Screen is not displayed in the background in Landscape Mode
2009-09-17 08:43:04 -07:00
Dianne Hackborn
c9cbd60c56 am e777e0a3: Merge change 25388 into eclair
Merge commit 'e777e0a3d1645c1b54f12af5779cb7ccf0c82234' into eclair-plus-aosp

* commit 'e777e0a3d1645c1b54f12af5779cb7ccf0c82234':
  Fix #1827299: Google login screen to re-enter password is not viewable
2009-09-17 08:42:53 -07:00
Eric Fischer
ee0553c58e am 0828beee: Merge change 25386 into eclair
Merge commit '0828beee503b99a8f38f456416592d4ed6c799ae' into eclair-plus-aosp

* commit '0828beee503b99a8f38f456416592d4ed6c799ae':
  Add one more hardware keyboard character popup: \ if you hold /
2009-09-17 08:42:29 -07:00
Dianne Hackborn
289a5e2846 am 8843620c: Merge change 25360 into eclair
Merge commit '8843620cb208904bb9583809c9cfbe9e41264ae0' into eclair-plus-aosp

* commit '8843620cb208904bb9583809c9cfbe9e41264ae0':
  Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing
2009-09-17 08:42:13 -07:00