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

32345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Adam Powell
40f45eeeb4 Merge "No action bars for default holo dialog theme" 2010-09-28 11:58:53 -07:00
Adam Powell
975c235b94 No action bars for default holo dialog theme 
Change-Id: If02cbc5312d161f38df998c2ef136b00f41d62b0
 2010-09-28 11:54:50 -07:00
Hung-ying Tyan
c508e8468f Fix build. 
Change-Id: I0c158e65eb47de64eb954a0e11c9843988cb8043
 2010-09-29 02:38:12 +08: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
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
Steve Block
31fb8b60fb Merge changes Ic62f60d9,I04a01634 
* changes:
  Provide a useful message in DumpRenderTree2 GUI when the host server is not running
  Prevent DumpRenderTree2 from crashing when the host server is not running
 2010-09-28 07:09:45 -07:00
Leon Scroggins
f2e17a8683 Hide the soft keyboard when a textfield is blurred. 
Bug: 2953257

Requires a change to external/webkit

Change-Id: I8ca82dc7cb6bc1494400f5e5c38050023c94a513
 2010-09-28 10:04:50 -04:00
Steve Block
cb98a3e621 Provide a useful message in DumpRenderTree2 GUI when the host server is not running 
Bug: 3010758
Change-Id: Ic62f60d96055e7ad1e475215ca384306cdfa859c
 2010-09-28 14:34:01 +01:00
Steve Block
898bfbd865 Prevent DumpRenderTree2 from crashing when the host server is not running 
Bug: 3010758
Change-Id: I04a01634544d223d225b264827d3cf18be74e1e0
 2010-09-28 14:21:03 +01:00
Mike Lockwood
698fcc1226 Merge changes I2491a2ce,Ie1c88bd8 
* changes:
  MtpCursor: Fix long to int truncation bug
  MtpCursor: Remove some unused variables
 2010-09-28 06:17:40 -07:00
Mike Lockwood
e11eba3c8a MtpCursor: Fix long to int truncation bug 
BUG: 2978335

Change-Id: I2491a2ce3b65afa272540090cabace52067b8534
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-28 09:14:50 -04:00
Mike Lockwood
90bbe5e486 MtpCursor: Remove some unused variables 
Change-Id: Ie1c88bd817c45fc19e34165f8d8557f00514188d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-28 08:36:15 -04:00
Steve Block
42bf092c47 Update run_layout_tests.py to give a useful error if DumpRenderTree2 is not found on the device 
Bug: 3006981
Change-Id: Ie789eb726bc051305371d4958c16ceca980ea1d1
 2010-09-28 13:12:36 +01:00
Steve Block
5c23ebadd4 Update the storage locations used by the Chromium HTTP stack 
This updates the strorage locations to better match those used by the
Android HTTP stack.

The corresponding external/webkit change is
https://android-git.corp.google.com/g/70643

Bug: 3039536
Change-Id: Ia7ea68d1472e96788a7fbaa6e8f7aa1ee51b3fb0
 2010-09-28 12:32:05 +01:00
Hung-ying Tyan
f7e13400b2 am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR 
Merge commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c' into gingerbread-plus-aosp

* commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c':
  SIP: add DisconnectCause.SERVER_ERROR
 2010-09-27 23:58:08 -07:00
Hung-ying Tyan
624d5b4e8c SIP: add DisconnectCause.SERVER_ERROR 
and fix how SipErrorCode.SERVER_ERROR is determinted from server response, not
from local exceptions.

http://b/issue?id=3041332

Change-Id: Idce67e29858d5c7573b98b7fa1fac074913d71d6
 2010-09-28 14:54:13 +08:00
Adam Powell
1d9fc8c504 Merge "Temporary hack to make context menu text visible on holo dialogs." 2010-09-27 23:17:34 -07:00
Adam Powell
e4679f1ed2 Temporary hack to make context menu text visible on holo dialogs. 
Real fix for this to come. MenuBuilder needs to not hardcode themes
and dialogs shouldn't either.

Change-Id: I393969acd1ef6956d7299cb2eff46708ce812d1d
 2010-09-27 23:12:39 -07:00
Chung-yih Wang
4a64afd288 am 24547592: Fix the startAudio order for 3-way calls. 
Merge commit '245475925eff61ee76bde58de69253a889e39d0a' into gingerbread-plus-aosp

* commit '245475925eff61ee76bde58de69253a889e39d0a':
  Fix the startAudio order for 3-way calls.
 2010-09-27 22:58:59 -07:00
Adam Powell
81eeecc305 Merge "Fix some text styling for Holo.Light" 2010-09-27 22:29:15 -07:00
Adam Powell
385fe872ab Fix some text styling for Holo.Light 
Change-Id: Ia082c12b2b0cef044170ba92e9f837bd38516c8e
 2010-09-27 22:26:03 -07:00
Hung-ying Tyan
400f12b4dd Fix build. 
Change-Id: Iae02fabe42013705592f75748388daf8fa5ed54e
 2010-09-28 13:01:49 +08:00
Chung-yih Wang
245475925e Fix the startAudio order for 3-way calls. 
Change-Id: Ib387b4b1f641f9bf52dd6007d23aee08f0925811
 2010-09-28 12:46:04 +08:00
Hung-ying Tyan
a57afb6a6c resolved conflicts for merge of 2a36a778 to master 
Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
 2010-09-28 12:17:44 +08:00