Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,365 Commits 3 Branches 0 Tags
556547dde9508ff88fe56a52c69e7ffb0e949f55
Commit Graph

32365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Andreas Huber
2b359ed5b5 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. 
Change-Id: I43875b6adaf96d4e982ef3dfc3d6c8f7034ac51d
related-to-bug: 3036592
 2010-09-28 11:56:39 -07:00
Adam Powell
975c235b94 No action bars for default holo dialog theme 
Change-Id: If02cbc5312d161f38df998c2ef136b00f41d62b0
 2010-09-28 11:54:50 -07:00
Andreas Huber
c889bbfa96 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 '4769f57948455277d0670ef18f64824ca5d894c1' into gingerbread-plus-aosp

* commit '4769f57948455277d0670ef18f64824ca5d894c1':
  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 11:48:44 -07:00
Andreas Huber
4769f57948 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 2010-09-28 11:46:41 -07:00
Hung-ying Tyan
c508e8468f Fix build. 
Change-Id: I0c158e65eb47de64eb954a0e11c9843988cb8043
 2010-09-29 02:38:12 +08:00
Andreas Huber
9d59186068 am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread 
Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp

* commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7':
  Squashed commit of the following:
 2010-09-28 11:35:22 -07:00
Dianne Hackborn
b763a6dc41 am 08cf57d7: Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread 
Merge commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5' into gingerbread-plus-aosp

* commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5':
  Fixes to granting URI permissions - take into account path perms.
 2010-09-28 11:32:38 -07:00
Andreas Huber
3a9cc8cef4 Merge "Squashed commit of the following:" into gingerbread 2010-09-28 11:27:33 -07:00
Andreas Huber
38ae220bb7 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. 
related-to-bug: 3036592
Change-Id: Ib142b171c829ed74156c0281d9d4543fcc96c802
 2010-09-28 11:26:03 -07:00
Dianne Hackborn
08cf57d791 Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread 2010-09-28 11:21:27 -07:00
Dianne Hackborn
48058e8536 Fixes to granting URI permissions - take into account path perms. 
Change-Id: I8073061a578eda90dadd3b0b909047aae0d64f2d
 2010-09-28 11:20:21 -07:00
Steve Block
27c5fab571 Reduce the AppCache maximum size to a more reasonable value in DumpRenderTree2 
Without this change, any use of AppCache fails after the test
http/tests/appcache/max-size.html has been run. The test in question
passes, but seems to leave the database in a corrupted state, causing
all future database transactions to fail. The only fix is to remove
the database file.

This behaviour is only observed with DumpRenderTree2, not
DumpRenderTree, so I don't think this is a WebView problem. I'm not
sure what the root cause is, but I think it make sense to submit this
fix now in order to get the LayoutTests stable with DumpRenderTree2.

Change-Id: I763c09406e66839676b839e3cdeba3b9427c1cb9
 2010-09-28 19:01:12 +01:00
Xavier Ducrohet
cdde57ae5c Merge "Improve error reporting in the layoutlib class replacement test." 2010-09-28 10:59:46 -07:00
Hung-ying Tyan
e18f15e6fe am 1738252a: am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread 
Merge commit '1738252a596c71851cabf5835acb3584ad6b3191'

* commit '1738252a596c71851cabf5835acb3584ad6b3191':
  Don't enter DISCONNECTING state when the call/connection is not alive
 2010-09-28 10:56:34 -07:00
Xavier Ducrohet
e335914c7e Improve error reporting in the layoutlib class replacement test. 
Change-Id: I451253ebb902171d67683784ef7a6de65588865d
 2010-09-28 10:55:24 -07:00
Romain Guy
a2a57aa02b Merge "Display the correct expected name when loading the wrong adapter." 2010-09-28 10:35:09 -07:00
Romain Guy
5a86c4c385 Display the correct expected name when loading the wrong adapter. 
Bug #3042860

Change-Id: I5533c6b99a6aa69e05b6acf8f140b64ee5ea02f0
 2010-09-28 10:33:37 -07:00
Stephen Hines
ab98bb6e8b Fix RS bug with message ID 0. 
Clamp RSTest list to nice viewable range.

Change-Id: I0909511e16984ec78150cda17c22e22af1fa0cdb
 2010-09-28 10:28:12 -07:00
Irfan Sheriff
6db6468956 am c89dd54c: Remove logging on wifilock acquire/release 
Merge commit 'c89dd54ceeec99173d51d1196e2c03a58f120211' into gingerbread-plus-aosp

* commit 'c89dd54ceeec99173d51d1196e2c03a58f120211':
  Remove logging on wifilock acquire/release
 2010-09-28 10:26:29 -07:00
Irfan Sheriff
c89dd54cee Remove logging on wifilock acquire/release 
Bug: 3042300
Change-Id: Ia3ce184f53bdd9afee1c78bb9c294af57364f266
 2010-09-28 10:13:14 -07:00
Gil Dobjanschi
b0725a4aeb Merge "Validate Overlay and effect duration and start time." 2010-09-28 10:08:53 -07:00
Andy Stadler
cb6f29ebc6 am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread 
Merge commit 'a16682b5e8ed635910eada23272ba6548922c02e' into gingerbread-plus-aosp

* commit 'a16682b5e8ed635910eada23272ba6548922c02e':
  Allow touch events when clickable *or* longClickable
 2010-09-28 10:06:27 -07:00
repo sync . build/envsetup.sh lunch passion-en
9231e82291 am 8c665807: (-s ours) am 4fc3d2f0: DO NOT MERGE 
Merge commit '8c66580759b3085866e1f9f1ca9af1a60220e574'

* commit '8c66580759b3085866e1f9f1ca9af1a60220e574':
  DO NOT MERGE
 2010-09-28 09:30:16 -07:00
Andy Stadler
a16682b5e8 Merge "Allow touch events when clickable *or* longClickable" into gingerbread 2010-09-28 09:26:49 -07:00
Gil Dobjanschi
f8b04868e6 Validate Overlay and effect duration and start time. 
Change-Id: I3235573f9edc65f148541adacd01eb5caa0b8615
 2010-09-28 09:24:29 -07:00
Dave Sparks
7dff9dfd61 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 were open on t 
Merge commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1' into gingerbread-plus-aosp

* commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1':
  Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
 2010-09-28 08:52:23 -07:00
Dave Sparks
269dea1c48 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 were open on the SD card. This fix changes the filter for the SD card, and adds the directory for data files as well." into gingerbread 2010-09-28 08:44:39 -07:00