Wink Saville
2f791fd868
Change dumpstate so the logs use threadtime instead of time as the default.
...
The threadtime option display both the pid and tid which can
assist pinpointing bugs.
Change-Id: Ib4620d3534a59b291507b757352f9fecb06f7cef
2010-10-22 09:48:19 -07:00
Joe Onorato
eb95b0877a
Show app services in adb bugreport (dumpstate).
...
There is a 60s timeout for this command. I'd rather do it as an individual timeout
for each of the services, but this is easier and will probably cover for busted apps
well enough. Also, this is running last in dumpstate, so if it's lost... oh well.
Also, clean up the formatting of the service dump so it's more readable in bugreport.
Change-Id: Ibd727f4b3366f7af9e7ef1e231868f5cedc48132
2010-10-22 12:36:07 -04:00
Joe Onorato
8d0083423f
Merge "Fix bug introduced in Change I856118d8."
2010-10-22 09:22:50 -07:00
Nick Pelly
d29c990874
am c81ec79d: am 0592832c: Merge "Attempt to fix simulator build." into gingerbread
...
Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e'
* commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e':
Attempt to fix simulator build.
2010-10-22 09:17:41 -07:00
Mike Lockwood
4c918335ef
am d78c8d8b: am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
...
Merge commit 'd78c8d8bb9516878eb5042a28d76bd6bcf4c6780'
* commit 'd78c8d8bb9516878eb5042a28d76bd6bcf4c6780':
GPS: Fix network type logic in requestRefLocation
2010-10-22 09:17:38 -07:00
Kenny Root
da36c84a97
am 7ba8c44e: am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread
...
Merge commit '7ba8c44ef7ba22d83a670e50314d69d0ddce1b9c'
* commit '7ba8c44ef7ba22d83a670e50314d69d0ddce1b9c':
Initialized check in ZipFileRO::findEntryByName
2010-10-22 09:14:28 -07:00
Chet Haase
0865f7629a
Merge "Fix native resource leak when OpenGL renderer is not being used."
2010-10-22 09:07:13 -07:00
Nick Pelly
c81ec79d1f
am 0592832c: Merge "Attempt to fix simulator build." into gingerbread
...
Merge commit '0592832c5e61b9c0008a4410f263ea0b0b991f05' into gingerbread-plus-aosp
* commit '0592832c5e61b9c0008a4410f263ea0b0b991f05':
Attempt to fix simulator build.
2010-10-22 09:03:21 -07:00
Mike Lockwood
d78c8d8bb9
am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
...
Merge commit 'f6572e7ee413a87f5d243b3d44f798260ac1a18b' into gingerbread-plus-aosp
* commit 'f6572e7ee413a87f5d243b3d44f798260ac1a18b':
GPS: Fix network type logic in requestRefLocation
2010-10-22 09:03:17 -07:00
Kenny Root
7ba8c44ef7
am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread
...
Merge commit '8ad30b5b7e380428701a44458393cbc2381f205b' into gingerbread-plus-aosp
* commit '8ad30b5b7e380428701a44458393cbc2381f205b':
Initialized check in ZipFileRO::findEntryByName
2010-10-22 08:59:24 -07:00
Chet Haase
27f0b17d85
Fix native resource leak when OpenGL renderer is not being used.
...
Native resources (bitmaps, matrices, paints, shaders) are shared when display lists
are used, and a refcounting system is in place to take care of disposing when all
clients are finished with them. But the cache where these refcounts are tracked is
not enabled when the Open GL renderer is not being used. This results in the native
destructors not being called, and the resources are leaked.
Change-Id: Ic7aeb55e4636dcad229846601407e596160346e6
2010-10-22 08:57:48 -07:00
Nick Pelly
0592832c5e
Merge "Attempt to fix simulator build." into gingerbread
2010-10-22 08:49:51 -07:00
Nick Pelly
1af97f0b78
Attempt to fix simulator build.
...
Change-Id: I7f912ce58292bdd03fa683d2e5c203480d94e945
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-22 08:48:48 -07:00
Joe Onorato
ea70e63c0d
Swap the navigation buttons and notification icons.
...
Left: BACK, HOME, RECENT, [MENU], [CLIPBOARD].
Right: NOTIFICATIONS, PANEL TRIGGER.
Many Bothans participated in usability tests to bring us
this change.
Change-Id: I45a0847226fd6264a3d62c60001e2b906ac15133
2010-10-22 11:32:28 -04:00
Mike Lockwood
f6572e7ee4
Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
2010-10-22 08:02:09 -07:00
Kenny Root
8ad30b5b7e
Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread
2010-10-22 07:55:44 -07:00
Leon Scroggins
f8ca2d71d5
Do not call WebTextView.requestFocus if WebView is not focused.
...
Bug:3118097
Bug:3039912
Change-Id: I4c43f394c9dc3c9db58fb744d588dfb36f3221f4
2010-10-22 10:47:36 -04:00
Mike Lockwood
edc0f3876c
GPS: Fix network type logic in requestRefLocation
...
Change-Id: I20ef81bcf029b289389dba57e6cf457fda5acbf4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-22 09:16:17 -04:00
Hung-ying Tyan
2754b4bde8
am d4d3f36f: am 1257d330: Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
...
Merge commit 'd4d3f36f4c25b41f4253eadd5e67035fe220cad3'
* commit 'd4d3f36f4c25b41f4253eadd5e67035fe220cad3':
Clean up pending sessions on incoming call in SipService
2010-10-22 06:01:29 -07:00
Jean-Baptiste Queru
1272c8b76b
Merge de8635e4 from gingerbread-plus-aosp
...
Change-Id: Ice15f34cc3ab7d938d8acde1033886b2765fee9d
2010-10-22 05:44:37 -07:00
Steve Block
3b860faec7
Merge "Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack"
2010-10-22 03:56:58 -07:00
Hung-ying Tyan
d4d3f36f4c
am 1257d330: Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
...
Merge commit '1257d330dcfdb87214278c8fc9718ea9fc663df6' into gingerbread-plus-aosp
* commit '1257d330dcfdb87214278c8fc9718ea9fc663df6':
Clean up pending sessions on incoming call in SipService
2010-10-21 23:15:20 -07:00
Hung-ying Tyan
1257d330dc
Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
2010-10-21 23:08:59 -07:00
Jason Sams
477d9b2ddc
Merge "Fix refcounting bugs where the sys refcount could be corrupted during async type creation."
2010-10-21 21:21:50 -07:00
Jason Sams
b38d534873
Fix refcounting bugs where the sys refcount
...
could be corrupted during async type creation.
Change-Id: If42828e92990598b0cb5da81c82ea513f94725f2
Fix stack object deletion bug.
Change-Id: I2c723aa5ad15e0c99dc9cd0cfbc7db80bace172a
2010-10-21 21:17:30 -07:00
Jeff Hamilton
de8635e4c4
am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.
...
Merge commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a' into gingerbread-plus-aosp
* commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a':
Backport ParcelFileDescriptor.createPipe() from master.
2010-10-21 21:08:20 -07:00
Daniel Lehmann
cde1ac6006
Add an extra to allow specifying the account for creation of new contacts
...
Change-Id: I6bbf1025e35bbc1d2acff747b08c07530bec2b8c
2010-10-21 20:40:11 -07:00
Jeff Hamilton
389a440ad1
Backport ParcelFileDescriptor.createPipe() from master.
...
This allows content providers to expose arbitraty data
through the ContentResolver open* APIs.
Change-Id: I408a0b7cee9cdba5654a962098386c012d6b3549
2010-10-21 22:39:41 -05:00
James Dong
627d836fff
am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread
...
Merge commit '6123e0f7c91ffc7534da99b4668879dacf662227'
* commit '6123e0f7c91ffc7534da99b4668879dacf662227':
Turn the media time adjustment in file writer back on
2010-10-21 20:27:34 -07:00
Dianne Hackborn
1b36424419
am eb5aeae6: am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread
...
Merge commit 'eb5aeae676fb23b2ad748185867c085e3cd65314'
* commit 'eb5aeae676fb23b2ad748185867c085e3cd65314':
Adjust boundaries for screen sizes.
2010-10-21 20:27:30 -07:00
Dianne Hackborn
30e257763f
am 101f14b2: (-s ours) am ba501785: Merge "Implement issue #3116702 : New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
...
Merge commit '101f14b275ab2451aef50dec427376d721d17aea'
* commit '101f14b275ab2451aef50dec427376d721d17aea':
Implement issue #3116702 : New manifest tags for supported screen sizes DO NOT MERGE
2010-10-21 20:27:26 -07:00
Dianne Hackborn
bff26d156d
am 86f1b643: am bf5efba2: Merge "Fix issue #3117918 : No way to finish a native activity" into gingerbread
...
Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295'
* commit '86f1b643d10e0b5b17ae01db3b81020db87b3295':
Fix issue #3117918 : No way to finish a native activity
2010-10-21 20:27:15 -07:00
James Dong
6123e0f7c9
am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread
...
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp
* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
Turn the media time adjustment in file writer back on
2010-10-21 20:18:16 -07:00
Dianne Hackborn
eb5aeae676
am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread
...
Merge commit 'fdbb2168f7a9a202ee9406d65e7ef98a6745b488' into gingerbread-plus-aosp
* commit 'fdbb2168f7a9a202ee9406d65e7ef98a6745b488':
Adjust boundaries for screen sizes.
2010-10-21 20:18:11 -07:00
Dianne Hackborn
101f14b275
am ba501785: Merge "Implement issue #3116702 : New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
...
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp
* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
Implement issue #3116702 : New manifest tags for supported screen sizes DO NOT MERGE
2010-10-21 20:17:56 -07:00
Dianne Hackborn
86f1b643d1
am bf5efba2: Merge "Fix issue #3117918 : No way to finish a native activity" into gingerbread
...
Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp
* commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc':
Fix issue #3117918 : No way to finish a native activity
2010-10-21 20:17:50 -07:00
James Dong
1bd8a8c8ac
Merge "Turn the media time adjustment in file writer back on" into gingerbread
2010-10-21 20:06:59 -07:00
Dianne Hackborn
fdbb2168f7
Merge "Adjust boundaries for screen sizes." into gingerbread
2010-10-21 19:21:28 -07:00
Dianne Hackborn
ba501785c7
Merge "Implement issue #3116702 : New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
2010-10-21 19:20:49 -07:00
Dianne Hackborn
bf5efba238
Merge "Fix issue #3117918 : No way to finish a native activity" into gingerbread
2010-10-21 19:09:44 -07:00
Dianne Hackborn
db28a94d49
Fix issue #3117918 : No way to finish a native activity
...
Change-Id: Ic53e712f7ab5412d72a31b96ecba252344b91644
2010-10-21 19:07:37 -07:00
James Dong
89a0104c7c
Turn the media time adjustment in file writer back on
...
o This was turned off to unblock the tests on some device
o The adjustment duration is increased to suppress fluctuations observed on some device
bug - 3058745
Change-Id: Iaeeb1c1c52783f5c679305645c995e57b4b2a573
2010-10-21 18:41:31 -07:00
Jeff Brown
4924aee9cb
am 482284ad: am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread
...
Merge commit '482284ad0e3226b49c27bf41442c1cb150853226'
* commit '482284ad0e3226b49c27bf41442c1cb150853226':
Fix a race condition in wallpaper move throttling.
2010-10-21 18:10:24 -07:00
Jeff Brown
482284ad0e
am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread
...
Merge commit '6b3178a6323e015644590ebaee86523e4bb81773' into gingerbread-plus-aosp
* commit '6b3178a6323e015644590ebaee86523e4bb81773':
Fix a race condition in wallpaper move throttling.
2010-10-21 18:05:53 -07:00
Jeff Brown
6b3178a632
Merge "Fix a race condition in wallpaper move throttling." into gingerbread
2010-10-21 18:02:54 -07:00
Hung-ying Tyan
60c45d0269
Clean up pending sessions on incoming call in SipService
...
Bug: 3122186
Change-Id: I25c9aa19d138f6940a29025d54e7bc2ffb7daa29
2010-10-22 09:01:49 +08:00
Dianne Hackborn
c981465aac
am 2f1eee34: am e9dbf208: Merge "Fix issue #3117472 : Format storage dialog still broken" into gingerbread
...
Merge commit '2f1eee34706cf42855541def5737c37a071d7293'
* commit '2f1eee34706cf42855541def5737c37a071d7293':
Fix issue #3117472 : Format storage dialog still broken
2010-10-21 17:44:40 -07:00
Jeff Brown
840db1f678
Fix a race condition in wallpaper move throttling.
...
Bug: 3099316
Change-Id: Ia3221975b5be7fae8359d6ab531bbecd0e29aee9
2010-10-21 17:36:54 -07:00
Dianne Hackborn
2f1eee3470
am e9dbf208: Merge "Fix issue #3117472 : Format storage dialog still broken" into gingerbread
...
Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp
* commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307':
Fix issue #3117472 : Format storage dialog still broken
2010-10-21 17:35:12 -07:00
Dianne Hackborn
e9dbf208e4
Merge "Fix issue #3117472 : Format storage dialog still broken" into gingerbread
2010-10-21 17:28:19 -07:00