OSDN Git Service
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:27:16 +0000 (17:27 -0700)]
resolved conflicts for merge of
b4ae2f1b to gingerbread-plus-aosp
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
Justin Ho [Mon, 25 Oct 2010 23:50:34 +0000 (16:50 -0700)]
am
044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Merge commit '
044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp
* commit '
044df235c86ac69bb0e56cb4387e111ec276276e':
DO NOT MERGE - Updated ringtone assets for crespo
Justin Ho [Mon, 25 Oct 2010 23:44:01 +0000 (16:44 -0700)]
Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Gloria Wang [Mon, 25 Oct 2010 23:39:11 +0000 (16:39 -0700)]
Merge "resolved conflicts for merge of
9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp
Joe Malin [Mon, 25 Oct 2010 23:22:46 +0000 (16:22 -0700)]
am
5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Merge commit '
5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp
* commit '
5016df1cface59b04ad59d0fef29ea32dcad8d60':
Doc Change: Revert NotePad sample test package
Eric Fischer [Mon, 25 Oct 2010 23:19:42 +0000 (16:19 -0700)]
am
3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp
* commit '
3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
Import revised translations. DO NOT MERGE
Joe Malin [Mon, 25 Oct 2010 23:19:18 +0000 (16:19 -0700)]
Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Eric Fischer [Mon, 25 Oct 2010 23:14:47 +0000 (16:14 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Gloria Wang [Mon, 25 Oct 2010 22:23:04 +0000 (15:23 -0700)]
resolved conflicts for merge of
9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
Jean-Baptiste Queru [Mon, 25 Oct 2010 22:32:12 +0000 (15:32 -0700)]
Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"
Jeff Hamilton [Mon, 25 Oct 2010 21:49:07 +0000 (14:49 -0700)]
am
106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread
Merge commit '
106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp
* commit '
106165b5102be226eb8049d2f7f62d7e26034e8a':
Add a RHS status bar slot for NFC.
Jeff Hamilton [Mon, 25 Oct 2010 21:46:45 +0000 (14:46 -0700)]
Merge "Add a RHS status bar slot for NFC." into gingerbread
Mike Lockwood [Mon, 25 Oct 2010 20:55:27 +0000 (13:55 -0700)]
am
8c32bddf: Merge "GPS: Disable verbose logging" into gingerbread
Merge commit '
8c32bddfac259543f4ed87341fce42bc5ed60506' into gingerbread-plus-aosp
* commit '
8c32bddfac259543f4ed87341fce42bc5ed60506':
GPS: Disable verbose logging
Mike Lockwood [Mon, 25 Oct 2010 20:49:13 +0000 (13:49 -0700)]
Merge "GPS: Disable verbose logging" into gingerbread
Mathias Agopian [Mon, 25 Oct 2010 20:38:15 +0000 (13:38 -0700)]
am
457bed2b: Merge "fix [
3123221] Video sticks playing back upside down following orientation switch" into gingerbread
Merge commit '
457bed2bc6561dd67429dde238453fee8602fa9b' into gingerbread-plus-aosp
* commit '
457bed2bc6561dd67429dde238453fee8602fa9b':
fix [
3123221] Video sticks playing back upside down following orientation switch
Mathias Agopian [Mon, 25 Oct 2010 20:38:11 +0000 (13:38 -0700)]
am
ce4d36ad: Merge "fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Merge commit '
ce4d36ad729f83253d4c5ec9906148f45cc00f8e' into gingerbread-plus-aosp
* commit '
ce4d36ad729f83253d4c5ec9906148f45cc00f8e':
fix [
3118445] Transform * Transform does not work as expected
Mathias Agopian [Mon, 25 Oct 2010 20:31:11 +0000 (13:31 -0700)]
Merge "fix [
3123221] Video sticks playing back upside down following orientation switch" into gingerbread
Mathias Agopian [Mon, 25 Oct 2010 20:31:03 +0000 (13:31 -0700)]
Merge "fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Gloria Wang [Mon, 25 Oct 2010 19:23:35 +0000 (12:23 -0700)]
Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback"
Adam Powell [Mon, 25 Oct 2010 19:07:51 +0000 (12:07 -0700)]
am
17efcde1: Merge "DO NOT MERGE Fix bug
3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Merge commit '
17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp
* commit '
17efcde161cbcbc0d98bf809036c5e640497f001':
DO NOT MERGE Fix bug
3124899 - timeout in CTS test
Adam Powell [Mon, 25 Oct 2010 18:43:03 +0000 (11:43 -0700)]
Merge "DO NOT MERGE Fix bug
3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Scott Main [Mon, 25 Oct 2010 18:27:55 +0000 (11:27 -0700)]
am
abb50f15: Merge "docs: fix a couple api links" into gingerbread
Merge commit '
abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp
* commit '
abb50f152879cc8dff1bf5cbc4d6375e959305cd':
docs: fix a couple api links
Scott Main [Mon, 25 Oct 2010 18:18:28 +0000 (11:18 -0700)]
Merge "docs: fix a couple api links" into gingerbread
Nick Pelly [Mon, 25 Oct 2010 16:09:37 +0000 (09:09 -0700)]
am
79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
Merge commit '
79e76f52a6235c01aec64a978e33b89cbb9e1c2e' into gingerbread-plus-aosp
* commit '
79e76f52a6235c01aec64a978e33b89cbb9e1c2e':
Fixed NdefTag parcelable conversion methods.
Wu-cheng Li [Mon, 25 Oct 2010 16:09:26 +0000 (09:09 -0700)]
am
89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Merge commit '
89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp
* commit '
89821204379816f6bee6902c4f132c014700c3b0':
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
Nick Pelly [Mon, 25 Oct 2010 15:58:00 +0000 (08:58 -0700)]
Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
Wu-cheng Li [Mon, 25 Oct 2010 15:55:54 +0000 (08:55 -0700)]
Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Nick Pelly [Mon, 25 Oct 2010 05:11:52 +0000 (22:11 -0700)]
am
145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Merge commit '
145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp
* commit '
145550a00ea59ff20133acc95315e463628e16db':
Document getPollBytes() and getActivationBytes().
Nick Pelly [Mon, 25 Oct 2010 05:06:15 +0000 (22:06 -0700)]
Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Mathias Agopian [Mon, 25 Oct 2010 02:03:58 +0000 (19:03 -0700)]
fix [
3123221] Video sticks playing back upside down following orientation switch
the overlay wasn't reconfigured when the screen-orientation changed. It was
only done when a parameter of the surface itself changed.
Change-Id: I0ca0925bf58ded4c91ab89d12cb1fe4d1477c96c
Dianne Hackborn [Mon, 25 Oct 2010 01:38:11 +0000 (18:38 -0700)]
am
23656899: Merge "Fix issue #
3126018: No way to specify NativeActivity\'s native method" into gingerbread
Merge commit '
236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp
* commit '
236568999411214ef440cabc6d12e3bf5f19d8f4':
Fix issue #
3126018: No way to specify NativeActivity's native method
Dianne Hackborn [Mon, 25 Oct 2010 01:33:36 +0000 (18:33 -0700)]
Merge "Fix issue #
3126018: No way to specify NativeActivity's native method" into gingerbread
Mathias Agopian [Sun, 24 Oct 2010 21:53:05 +0000 (14:53 -0700)]
fix [
3118445] Transform * Transform does not work as expected
The problem wasn't in the multiply operator, but rather in the code
that built the transform from the HAL bitmask.
We now use the multiply operator to build the Transform from the bitmask,
which guarantees, it'll always be correct.
Also added a simple test for Transform.
Change-Id: I09bf3b0e51d92f59d83ea91c4cc94fc2aa0bf227
Jeff Brown [Sun, 24 Oct 2010 21:31:41 +0000 (14:31 -0700)]
am
860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Merge commit '
860c2df4132a2a0be9bcb0e91bfb7e79588c000f' into gingerbread-plus-aosp
* commit '
860c2df4132a2a0be9bcb0e91bfb7e79588c000f':
Add unit tests for native input and fix bugs identified.
Jeff Brown [Sun, 24 Oct 2010 21:18:19 +0000 (14:18 -0700)]
Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Joe Onorato [Sun, 24 Oct 2010 16:25:49 +0000 (09:25 -0700)]
am
60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too.
Merge commit '
60607a9012c9b7d39bef8fcf0284772f1b061efc' into gingerbread-plus-aosp
* commit '
60607a9012c9b7d39bef8fcf0284772f1b061efc':
Make sure that when the screen is off, we don't try to turn the buttons on too.
Jean-Baptiste Queru [Sun, 24 Oct 2010 12:26:09 +0000 (05:26 -0700)]
Merge "Introduce a list of all the audio files" into gingerbread-plus-aosp
Jeff Brown [Wed, 20 Oct 2010 22:33:38 +0000 (15:33 -0700)]
Add unit tests for native input and fix bugs identified.
Fixed a bug where we would lose the first touch point when swiping out of
the virtual key area.
Fixed a bug where we would not send an ACTION_MOVE event in cases where
individual pointers went down/up and the remaining pointers actually moved.
This is important since many applications do not handle pointer movements
during ACTION_POINTER_DOWN or ACTION_POINTER_UP. In the case of
ACTION_POINTER_UP the movement was completely lost since all pointers were
dispatched using their old location rather than the new location.
Improved motion event validation to check for duplicate pointer ids.
Added an input source constant that was missing from the NDK api but
defined in the framework api.
Added a timestamp when reporting added/removed devices in EventHub.
Bug:
3070082
Change-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56
Eric Laurent [Sat, 23 Oct 2010 01:41:29 +0000 (18:41 -0700)]
am
b6a2256e: Merge "Fix issue
3126094." into gingerbread
Merge commit '
b6a2256e5461160a89d077b761d3253d95ce869f' into gingerbread-plus-aosp
* commit '
b6a2256e5461160a89d077b761d3253d95ce869f':
Fix issue
3126094.
Eric Laurent [Sat, 23 Oct 2010 01:37:09 +0000 (18:37 -0700)]
Merge "Fix issue
3126094." into gingerbread
Eric Fischer [Sat, 23 Oct 2010 01:21:14 +0000 (18:21 -0700)]
am
ecae6e06: Merge "Import translations for status bar." into gingerbread
Merge commit '
ecae6e06a3bed9b6ab108629e4180fe55f4726ed' into gingerbread-plus-aosp
* commit '
ecae6e06a3bed9b6ab108629e4180fe55f4726ed':
Import translations for status bar.
Eric Rowe [Sat, 23 Oct 2010 01:21:09 +0000 (18:21 -0700)]
am
8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
Merge commit '
8de43ab5ba818b9552326d5383729b3e6fbf7c82' into gingerbread-plus-aosp
* commit '
8de43ab5ba818b9552326d5383729b3e6fbf7c82':
Change disable timeout for BT disable stress test
Nick Pelly [Sat, 23 Oct 2010 01:20:52 +0000 (18:20 -0700)]
am
07f3bee2: Push Tag/NdefTag implementation details into the service.
Merge commit '
07f3bee2db8b6e93ebbf7222676bd9f468e85569' into gingerbread-plus-aosp
* commit '
07f3bee2db8b6e93ebbf7222676bd9f468e85569':
Push Tag/NdefTag implementation details into the service.
Eric Fischer [Sat, 23 Oct 2010 00:14:36 +0000 (17:14 -0700)]
Merge "Import translations for status bar." into gingerbread
Eric Rowe [Sat, 23 Oct 2010 00:14:12 +0000 (17:14 -0700)]
Merge "Change disable timeout for BT disable stress test" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:08:27 +0000 (16:08 -0700)]
am
67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:06:37 +0000 (16:06 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:01:34 +0000 (16:01 -0700)]
am
a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
Eric Fischer [Fri, 22 Oct 2010 22:59:42 +0000 (15:59 -0700)]
Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 21:03:08 +0000 (14:03 -0700)]
am
38993d8d: Merge "Fix issue #
3122240: Expose xlarge in GB." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 21:01:25 +0000 (14:01 -0700)]
Merge "Fix issue #
3122240: Expose xlarge in GB." into gingerbread
Xavier Ducrohet [Fri, 22 Oct 2010 20:38:58 +0000 (13:38 -0700)]
am
c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"
Xavier Ducrohet [Fri, 22 Oct 2010 20:28:39 +0000 (13:28 -0700)]
Merge "Make layoutlib use the prebuilt of layoutlib_api"
Kenny Root [Fri, 22 Oct 2010 19:18:46 +0000 (12:18 -0700)]
am
40763914: Merge "Exit immediately on some linklib failures" into gingerbread
Kenny Root [Fri, 22 Oct 2010 19:17:02 +0000 (12:17 -0700)]
Merge "Exit immediately on some linklib failures" into gingerbread
Justin Ho [Fri, 22 Oct 2010 19:15:36 +0000 (12:15 -0700)]
am
0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread
Justin Ho [Fri, 22 Oct 2010 19:14:26 +0000 (12:14 -0700)]
Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 19:11:33 +0000 (12:11 -0700)]
am
7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread
Jeff Hamilton [Fri, 22 Oct 2010 19:11:23 +0000 (12:11 -0700)]
am
7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 17:58:35 +0000 (10:58 -0700)]
Merge "Update script for copying NDK headers/library." into gingerbread
Jeff Hamilton [Fri, 22 Oct 2010 17:20:06 +0000 (10:20 -0700)]
Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
Nick Pelly [Fri, 22 Oct 2010 16:03:21 +0000 (09:03 -0700)]
am
0592832c: Merge "Attempt to fix simulator build." into gingerbread
Merge commit '
0592832c5e61b9c0008a4410f263ea0b0b991f05' into gingerbread-plus-aosp
* commit '
0592832c5e61b9c0008a4410f263ea0b0b991f05':
Attempt to fix simulator build.
Mike Lockwood [Fri, 22 Oct 2010 16:03:17 +0000 (09:03 -0700)]
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
Kenny Root [Fri, 22 Oct 2010 15:59:24 +0000 (08:59 -0700)]
am
8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread
Merge commit '
8ad30b5b7e380428701a44458393cbc2381f205b' into gingerbread-plus-aosp
* commit '
8ad30b5b7e380428701a44458393cbc2381f205b':
Initialized check in ZipFileRO::findEntryByName
Nick Pelly [Fri, 22 Oct 2010 15:49:51 +0000 (08:49 -0700)]
Merge "Attempt to fix simulator build." into gingerbread
Mike Lockwood [Fri, 22 Oct 2010 15:02:09 +0000 (08:02 -0700)]
Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
Kenny Root [Fri, 22 Oct 2010 14:55:44 +0000 (07:55 -0700)]
Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread
Hung-ying Tyan [Fri, 22 Oct 2010 06:15:20 +0000 (23:15 -0700)]
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
Hung-ying Tyan [Fri, 22 Oct 2010 06:08:59 +0000 (23:08 -0700)]
Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
Jeff Hamilton [Fri, 22 Oct 2010 04:08:20 +0000 (21:08 -0700)]
am
389a440a: Backport ParcelFileDescriptor.createPipe() from
Merge commit '
389a440ad13f7b16e8f7c7f1670bdd55f1e2112a' into gingerbread-plus-aosp
* commit '
389a440ad13f7b16e8f7c7f1670bdd55f1e2112a':
Backport ParcelFileDescriptor.createPipe() from master.
James Dong [Fri, 22 Oct 2010 03:18:16 +0000 (20:18 -0700)]
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
Dianne Hackborn [Fri, 22 Oct 2010 03:18:11 +0000 (20:18 -0700)]
am
fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread
Merge commit '
fdbb2168f7a9a202ee9406d65e7ef98a6745b488' into gingerbread-plus-aosp
* commit '
fdbb2168f7a9a202ee9406d65e7ef98a6745b488':
Adjust boundaries for screen sizes.
Dianne Hackborn [Fri, 22 Oct 2010 03:17:56 +0000 (20:17 -0700)]
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
Dianne Hackborn [Fri, 22 Oct 2010 03:17:50 +0000 (20:17 -0700)]
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
James Dong [Fri, 22 Oct 2010 03:06:59 +0000 (20:06 -0700)]
Merge "Turn the media time adjustment in file writer back on" into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 02:21:28 +0000 (19:21 -0700)]
Merge "Adjust boundaries for screen sizes." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 02:20:49 +0000 (19:20 -0700)]
Merge "Implement issue #
3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 02:09:44 +0000 (19:09 -0700)]
Merge "Fix issue #
3117918: No way to finish a native activity" into gingerbread
Jeff Brown [Fri, 22 Oct 2010 01:05:53 +0000 (18:05 -0700)]
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.
Jeff Brown [Fri, 22 Oct 2010 01:02:54 +0000 (18:02 -0700)]
Merge "Fix a race condition in wallpaper move throttling." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 00:35:12 +0000 (17:35 -0700)]
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
Dianne Hackborn [Fri, 22 Oct 2010 00:28:19 +0000 (17:28 -0700)]
Merge "Fix issue #
3117472: Format storage dialog still broken" into gingerbread
Mathias Agopian [Fri, 22 Oct 2010 00:07:15 +0000 (17:07 -0700)]
am
aa6df366: Merge "fix [
3119687] [Maps][4.6.0] Force close in street view" into gingerbread
Merge commit '
aa6df3669deab2a804c6f8cc1ea3fd5af0a28685' into gingerbread-plus-aosp
* commit '
aa6df3669deab2a804c6f8cc1ea3fd5af0a28685':
fix [
3119687] [Maps][4.6.0] Force close in street view
Mathias Agopian [Thu, 21 Oct 2010 23:43:00 +0000 (16:43 -0700)]
Merge "fix [
3119687] [Maps][4.6.0] Force close in street view" into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 23:26:02 +0000 (16:26 -0700)]
am
0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '
0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp
* commit '
0c636055351f2e1d26138cf7b3bf3c82553e68c4':
Mirror the preview for front-facing cameras. do not merge
Kenny Root [Thu, 21 Oct 2010 23:22:58 +0000 (16:22 -0700)]
am
1d79a9d9: Use correct size of GAMEPAD_KEYCODES
Merge commit '
1d79a9d9f85f932a1fd6dcddba335450b65ba4e6' into gingerbread-plus-aosp
* commit '
1d79a9d9f85f932a1fd6dcddba335450b65ba4e6':
Use correct size of GAMEPAD_KEYCODES
Mathias Agopian [Thu, 21 Oct 2010 23:20:07 +0000 (16:20 -0700)]
Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 22:58:25 +0000 (15:58 -0700)]
fix [
3119687] [Maps][4.6.0] Force close in street view
The EGLConfig attributes MUST be sorted, because they're used in a binary search.
A recent change introduced a bug where 2 of the configs had improperly
sorted attributes.
Change-Id: I1ac53e4463d62f27125ca9f82ed946e6c98ddba0
Kenny Root [Thu, 21 Oct 2010 22:46:03 +0000 (15:46 -0700)]
Use correct size of GAMEPAD_KEYCODES
Compute the actual number of indices in the GAMEPAD_KEYCODES instead of
the pure size in bytes.
Bug:
3121536
Change-Id: I71edbd8bf6eff2c8cc0ea5c6845362b3d1e06466
Kenny Root [Thu, 21 Oct 2010 22:18:28 +0000 (15:18 -0700)]
Initialized check in ZipFileRO::findEntryByName
If a ZipFileRO object is uninitialized, the hash table will not have
been initialized. This condition wasn't checked in findEntryByName.
Bug:
3121109
Change-Id: Ib696e0e7e0cb4dd0fb2e456d6a847e5e8f4fe14e
Chia-chi Yeh [Thu, 21 Oct 2010 19:57:03 +0000 (12:57 -0700)]
am
703aae06: Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread
Merge commit '
703aae06c0925b19657877bb1872bb2f28874969' into gingerbread-plus-aosp
* commit '
703aae06c0925b19657877bb1872bb2f28874969':
RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.
Chia-chi Yeh [Thu, 21 Oct 2010 19:53:37 +0000 (12:53 -0700)]
Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread
Nick Kralevich [Thu, 21 Oct 2010 18:50:55 +0000 (11:50 -0700)]
am
62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread
Merge commit '
62d0970c82f9a2c17aea67379c207a3f17556c46' into gingerbread-plus-aosp
* commit '
62d0970c82f9a2c17aea67379c207a3f17556c46':
allow dumpstate to work for non-root users.
John Huang [Thu, 21 Oct 2010 18:46:55 +0000 (11:46 -0700)]
am
7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
Merge commit '
7dc08fb070ff7455e794fc81645ccb4349cd152f' into gingerbread-plus-aosp
* commit '
7dc08fb070ff7455e794fc81645ccb4349cd152f':
Fix connect duration for un-established SIP calls.
Nick Kralevich [Thu, 21 Oct 2010 18:35:49 +0000 (11:35 -0700)]
Merge "allow dumpstate to work for non-root users." into gingerbread
John Huang [Thu, 21 Oct 2010 17:46:17 +0000 (10:46 -0700)]
Merge "Fix connect duration for un-established SIP calls." into gingerbread
Sylvain Fonteneau [Thu, 21 Oct 2010 16:38:49 +0000 (09:38 -0700)]
am
a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method.
Merge commit '
a71354d76689802152c33af257092d639c03c421' into gingerbread-plus-aosp
* commit '
a71354d76689802152c33af257092d639c03c421':
Enable presence check at application level using
Nick Pelly [Thu, 21 Oct 2010 16:38:15 +0000 (09:38 -0700)]
am
7ea5c45e: NFC settings cleanup.
Merge commit '
7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp
* commit '
7ea5c45e8d89f59065f088d4e11cceeeed9d64d1':
NFC settings cleanup.
Brad Fitzpatrick [Thu, 21 Oct 2010 16:10:55 +0000 (09:10 -0700)]
am
15358e14: Merge "Make the base direction of the Arabic error pages RTL"
Merge commit '
15358e145622df90942a444a63ae0006713b636d' into gingerbread-plus-aosp
* commit '
15358e145622df90942a444a63ae0006713b636d':
Make the base direction of the Arabic error pages RTL
Brad Fitzpatrick [Thu, 21 Oct 2010 16:10:47 +0000 (09:10 -0700)]
am
6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL"
Merge commit '
6cf9c39452c87fe424a0ca125cf797e1c5e0830b' into gingerbread-plus-aosp
* commit '
6cf9c39452c87fe424a0ca125cf797e1c5e0830b':
Set the base direction of the Hebrew error pages to RTL
OSDN Git Service
