Commit Graph

38903 Commits

Author SHA1 Message Date
Ying Wang
0e8dc464bd am 292c246b: Merge "Call functions to calculate deps and classes.jar" into gingerbread
Merge commit '292c246b27319bc2195e2b3dbc3c3adea22db672' into gingerbread-plus-aosp

* commit '292c246b27319bc2195e2b3dbc3c3adea22db672':
  Call functions to calculate deps and classes.jar
2010-09-28 15:09:49 -07:00
Ying Wang
292c246b27 Merge "Call functions to calculate deps and classes.jar" into gingerbread 2010-09-28 15:06:10 -07:00
Jim Shuma
cf9076e7a5 Initial checkin of a framerate test app
Measures the time to do nothing but clear the screen in an
OpenGL Java app. Spews frame time statistics to the log.

Control long frame time by setting debug.longframe_ms;
e.g., adb shell setprop debug.longframe_ms 33

Change-Id: I435a3cb170048349e00417c44db42121c68744b2
2010-09-28 14:59:20 -07:00
Chia-chi Yeh
df31e03c47 am 320cdcb1: Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread
Merge commit '320cdcb122505ba703326a102f9b13d2f2f8847a' into gingerbread-plus-aosp

* commit '320cdcb122505ba703326a102f9b13d2f2f8847a':
  RTP: Delay the initialization of AudioTrack and AudioRecord.
2010-09-28 14:51:47 -07:00
Chia-chi Yeh
78c11b3cf1 RTP: Refactor out G711 codecs into another file.
Change-Id: I38dbefef2315a28d44683e86a51e69f38e3f20ec
2010-09-29 05:46:19 +08:00
Jason Sams
f3470edc8a Fix safe for mp check in ScriptC.
Change-Id: Id91b3c1e99b2705fd39f9e74a52c61110805e246
2010-09-28 14:41:42 -07:00
Chia-chi Yeh
320cdcb122 Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread 2010-09-28 14:41:18 -07:00
Jeff Hamilton
a2f9266075 Add a Settings table to BrowserContract.
It contains global settings that are shared
between the Browser app and the sync adapters.

Change-Id: I294ad8b03a44686858fc61a3ae6bbab86f124f99
2010-09-28 16:41:10 -05:00
Ying Wang
c486da4887 Call functions to calculate deps and classes.jar
Instead of hard-coding them.

Change-Id: Ia5818a1a69efb0964d5aa7de7e8d30ef04dfeccc
2010-09-28 14:33:58 -07:00
Chia-chi Yeh
9083c84af1 RTP: Delay the initialization of AudioTrack and AudioRecord.
Related to http://b/3043844.

Change-Id: I2c4fd9f64e6eba597d68b2ea1ceeff83103697db
2010-09-29 05:24:34 +08:00
Eric Laurent
4fd3ecc1f0 Fix several audio effects problems.
Fixed the following issues in LVM effect bundle wrapper:
- memory leaks in EffectCreate() in case effect creation fails at various stages
- Added saturation when accumulating to output buffer
- Fixed problems with enabled effects count when an effect is released while enabled
- Do not allocate temporary buffer for accumulation each time process() is called

Fixed the following issues in effects framework (AudioFlinger)
- Release effect synchronously in the library when deleted from effect chain
- Do not call the effect process function if no tracks are present in the same
audio session

Change-Id: Ifbd80a163415cfb3c0a337c12082853ea45d9c91
2010-09-28 14:23:39 -07:00
repo sync
556547dde9 Merge "focus issues" 2010-09-28 14:22:11 -07:00
Stephen Hines
d6b55a66ff Merge "Fix RS bug with message ID 0." 2010-09-28 14:21:22 -07:00
Andreas Huber
ce635b5504 am d6c30e8c: am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
Merge commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023'

* commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023':
  Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
2010-09-28 14:01:14 -07:00
Andreas Huber
3bf613b268 am c889bbfa: am 4769f579: Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
Merge commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06'

* commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06':
  Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
2010-09-28 14:00:36 -07:00
Andreas Huber
1a3038586a am 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread
Merge commit '9d59186068891834272c2e3ee6f9c4228af24656'

* commit '9d59186068891834272c2e3ee6f9c4228af24656':
  Squashed commit of the following:
2010-09-28 13:59:26 -07:00
Dianne Hackborn
e8fd195208 am b763a6dc: am 08cf57d7: Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread
Merge commit 'b763a6dc41dcce76585c56657903ae72c5422ae1'

* commit 'b763a6dc41dcce76585c56657903ae72c5422ae1':
  Fixes to granting URI permissions - take into account path perms.
2010-09-28 13:58:12 -07:00
Jeff Brown
1c730c87f3 Merge "Fix bug in split touches." 2010-09-28 13:43:00 -07:00
Jeff Brown
0c1f756812 Fix bug in split touches.
Cherry-picked down to master.

Change-Id: I786761bd6aecc021ae22d8c9a022324f3a9980d1
2010-09-28 13:41:00 -07:00
Vasu Nori
6dcad82332 Merge "SQLiteDatabase: fix inconsistent locking" 2010-09-28 13:39:03 -07:00
Vasu Nori
2467561ac2 SQLiteDatabase: fix inconsistent locking
Synchronized blocks should never call lock() or any operation that
does it. otherwise, bugs like bug:3032897 will occur.
Remove synchronization on all methods in SQLiteStatement
and SQLiteProgram because the caller is supposed to
do the synchronization if the same SQLiteStatement or
SQLiteQuery (which extends SQLiteProgram) object
is used by more than one thread at the same time.
(documentation on SQLiteStatement, SQLiteProgram
mentions this note)

Change-Id: Ifd6ee94d743c38c187e2eb778c57076da7a15073
2010-09-28 13:38:14 -07:00
Jeff Brown
7d6f864f9e am 65a5ba45: Merge "Fix bug in split touches." into gingerbread
Merge commit '65a5ba45559e88a50c258d794a1728498c248376' into gingerbread-plus-aosp

* commit '65a5ba45559e88a50c258d794a1728498c248376':
  Fix bug in split touches.
2010-09-28 13:30:15 -07:00
Jeff Brown
65a5ba4555 Merge "Fix bug in split touches." into gingerbread 2010-09-28 13:27:37 -07:00
Jeff Brown
aeec2bf66a Fix bug in split touches.
Change-Id: I808c2201a06938f82817058059f4ddcc9b1a9ae2
2010-09-28 13:26:42 -07:00
Andreas Huber
387bdcdadc am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread
Merge commit '88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp

* commit '88a995edcf3c371845cb32aed8bcddb7509bf875':
  Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
2010-09-28 13:26:26 -07:00
Andreas Huber
88a995edcf Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread 2010-09-28 13:23:26 -07:00
Irfan Sheriff
b974d0c8f2 am 6db64689: am c89dd54c: Remove logging on wifilock acquire/release
Merge commit '6db6468956fa6d71d68e410a532ed7b1bcaecf74'

* commit '6db6468956fa6d71d68e410a532ed7b1bcaecf74':
  Remove logging on wifilock acquire/release
2010-09-28 13:20:43 -07:00
Andy Stadler
8aeeda9123 am cb6f29eb: am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread
Merge commit 'cb6f29ebc6a8cde6ed600d233e23b962d06ea43f'

* commit 'cb6f29ebc6a8cde6ed600d233e23b962d06ea43f':
  Allow touch events when clickable *or* longClickable
2010-09-28 13:20:05 -07:00
Dave Sparks
762665094f am 7dff9dfd: am 269dea1c: Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that w
Merge commit '7dff9dfd6176fad1318a27f16318561453a429f0'

* commit '7dff9dfd6176fad1318a27f16318561453a429f0':
  Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
2010-09-28 13:19:55 -07:00
Andreas Huber
ad3fcfe845 Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
Change-Id: I4909fdf19518dbabb6c340e2a31b50dfe6c5b067
related-to-bug: 3029947
2010-09-28 13:13:38 -07:00
Hung-ying Tyan
0d44776016 am 6d028dd2: Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread
Merge commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42' into gingerbread-plus-aosp

* commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42':
  SIP: Feedback any provisional responses in addition to RING
2010-09-28 13:02:55 -07:00
repo sync
6a81b8271d focus issues
1.  Don't bring up the keyboard if we're iconified by default
2.  Also override onRequestFocusInDescendants to return false.  This makes it so that we don't focus on the search edit text which is in the actionbar.

Change-Id: I345e9cd77f686f13762a20454a76ff1f7c4a5556
2010-09-28 13:02:07 -07:00
Hung-ying Tyan
6d028dd2f1 Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread 2010-09-28 13:00:38 -07:00
Gilles Debunne
0d0dc6a70c am d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread
Merge commit 'd9743af92ead39b9f648043d165c415dfe8f3668' into gingerbread-plus-aosp

* commit 'd9743af92ead39b9f648043d165c415dfe8f3668':
  New assets. DO NOT MERGE>
2010-09-28 13:00:32 -07:00
Winson Chung
61ac7e3b36 Being more judicious in resetting meta data for the RemoteAdapter.
- Also adding more error checking when we go to apply the RemoteViews

Change-Id: Id7b13f390cc8ff08fdf8d96cf6bdc5668bf4f2f0
2010-09-28 12:58:29 -07:00
Gilles Debunne
d9743af92e Merge "New assets. DO NOT MERGE>" into gingerbread 2010-09-28 12:56:54 -07:00
Guang Zhu
5936c072b6 Merge "add multiple device support to layout test driver script" 2010-09-28 12:56:08 -07:00
Guang Zhu
82c11b42f1 add multiple device support to layout test driver script
pass on the serial number onto adb command so that it don't get
confused when multiple devices are connected

Change-Id: I0b16f9da941d77425bcc5f782393f8800e035871
2010-09-28 12:54:02 -07:00
Hung-ying Tyan
6c6eacda80 am f7e13400: am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR
Merge commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236'

* commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236':
  SIP: add DisconnectCause.SERVER_ERROR
2010-09-28 12:47:49 -07:00
Chung-yih Wang
3c094de4a9 am 4a64afd2: am 24547592: Fix the startAudio order for 3-way calls.
Merge commit '4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989'

* commit '4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989':
  Fix the startAudio order for 3-way calls.
2010-09-28 12:47:37 -07:00
Hung-ying Tyan
e24ef40e57 am 159cceaa: am 368d796e: Fix build.
Merge commit '159cceaae22076b743626ddde84c501b3f491f6e'

* commit '159cceaae22076b743626ddde84c501b3f491f6e':
  Fix build.
2010-09-28 12:47:31 -07:00
Jeff Brown
c188062eb6 am 26d5786f: am 9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread
Merge commit '26d5786fb1a43d82b40fa908e1220a018b748c93'

* commit '26d5786fb1a43d82b40fa908e1220a018b748c93':
  Fix pointer index when splitting secondary pointers.
2010-09-28 12:47:13 -07:00
jsh
8110290388 am 37a3631e: Merge "Add line break between PLMN and SPN in windowshade." into gingerbread
Merge commit '37a3631edfb1b848daca23bf5a12e1ab4bb6e096' into gingerbread-plus-aosp

* commit '37a3631edfb1b848daca23bf5a12e1ab4bb6e096':
  Add line break between PLMN and SPN in windowshade.
2010-09-28 12:46:57 -07:00
jsh
37a3631edf Merge "Add line break between PLMN and SPN in windowshade." into gingerbread 2010-09-28 12:44:47 -07:00
Steve Howard
9d9719c44a am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp

* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
  Move DownloadManager to android.app (DO NOT MERGE)
2010-09-28 12:41:42 -07:00
Steve Howard
5bdb89d7ac Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread 2010-09-28 12:38:15 -07:00
Andreas Huber
d6c30e8c15 am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
Merge commit 'be0450619528e65eebfa1d7eab78fde757d094cc' into gingerbread-plus-aosp

* commit 'be0450619528e65eebfa1d7eab78fde757d094cc':
  Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
2010-09-28 12:05:08 -07:00
Andreas Huber
be04506195 Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread 2010-09-28 12:02:35 -07:00
Adam Powell
40f45eeeb4 Merge "No action bars for default holo dialog theme" 2010-09-28 11:58:53 -07:00
Gilles Debunne
01d0efde2d New assets. DO NOT MERGE>
lock screen, and various status bar icons.

Change-Id: I3b76ac45ba31f2b2141bff64bfcae26f6963863f
2010-09-28 11:58:27 -07:00