OSDN Git Service
Jean-Baptiste Queru [Tue, 21 Sep 2010 17:21:37 +0000 (10:21 -0700)]
am
7869f08c: Merge "MOTOYA Japanese fonts"
Merge commit '
7869f08c55d774b0006c2260e87747ff5e0746f2' into gingerbread-plus-aosp
* commit '
7869f08c55d774b0006c2260e87747ff5e0746f2':
MOTOYA Japanese fonts
Jean-Baptiste Queru [Tue, 21 Sep 2010 17:09:12 +0000 (10:09 -0700)]
Merge "MOTOYA Japanese fonts"
Wu-cheng Li [Tue, 21 Sep 2010 15:57:15 +0000 (08:57 -0700)]
am
d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit '
d45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp
* commit '
d45cb72ac0d7d57829ffc9223decb89a5fc42ce2':
Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Mike Lockwood [Tue, 21 Sep 2010 15:48:15 +0000 (08:48 -0700)]
am
92630c78: Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread
Merge commit '
92630c787d0ae34c7ae3cb29c2d261f1acaf18b9' into gingerbread-plus-aosp
* commit '
92630c787d0ae34c7ae3cb29c2d261f1acaf18b9':
SystemUI: Use new USB notifications to detect USB disconnect.
Mike Lockwood [Tue, 21 Sep 2010 15:45:34 +0000 (08:45 -0700)]
Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread
Robert Greenwalt [Tue, 21 Sep 2010 15:22:59 +0000 (08:22 -0700)]
am
6548f395: Merge "Inet status bug fix" into gingerbread
Merge commit '
6548f395a974d2a8dcefe29b3a498d1ca87d8aef' into gingerbread-plus-aosp
* commit '
6548f395a974d2a8dcefe29b3a498d1ca87d8aef':
Inet status bug fix
Robert Greenwalt [Tue, 21 Sep 2010 15:06:15 +0000 (08:06 -0700)]
Merge "Inet status bug fix" into gingerbread
Dianne Hackborn [Tue, 21 Sep 2010 07:27:06 +0000 (00:27 -0700)]
am
6f33b65f: Merge "Fix issue #
2999757: "Application Redirected" dialogue showing up erratically" into gingerbread
Merge commit '
6f33b65f8033cf8644eb4ba727421b90bd4c0ae9' into gingerbread-plus-aosp
* commit '
6f33b65f8033cf8644eb4ba727421b90bd4c0ae9':
Fix issue #
2999757: "Application Redirected" dialogue showing up erratically
Dianne Hackborn [Tue, 21 Sep 2010 07:24:23 +0000 (00:24 -0700)]
Merge "Fix issue #
2999757: "Application Redirected" dialogue showing up erratically" into gingerbread
Chung-yih Wang [Tue, 21 Sep 2010 05:48:09 +0000 (22:48 -0700)]
am
4c571a62: Fix the build.
Merge commit '
4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp
* commit '
4c571a62b1a4fb71585179bce84246b55097b47e':
Fix the build.
Dianne Hackborn [Tue, 21 Sep 2010 05:22:54 +0000 (22:22 -0700)]
am
51aaab3d: Merge "Fix #
2999258: ANR in Settings after every reboot" into gingerbread
Merge commit '
51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d' into gingerbread-plus-aosp
* commit '
51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d':
Fix #
2999258: ANR in Settings after every reboot
Dianne Hackborn [Tue, 21 Sep 2010 05:19:47 +0000 (22:19 -0700)]
Merge "Fix #
2999258: ANR in Settings after every reboot" into gingerbread
Chung-yih Wang [Tue, 21 Sep 2010 05:06:49 +0000 (22:06 -0700)]
am
708e4251: Merge "Revert the ANSWERING state." into gingerbread
Merge commit '
708e42512a8b14202cd872d96d1f071ccb4cf915' into gingerbread-plus-aosp
* commit '
708e42512a8b14202cd872d96d1f071ccb4cf915':
Revert the ANSWERING state.
Chung-yih Wang [Tue, 21 Sep 2010 05:04:57 +0000 (22:04 -0700)]
Merge "Revert the ANSWERING state." into gingerbread
Robert Greenwalt [Tue, 21 Sep 2010 04:31:29 +0000 (21:31 -0700)]
am
313af5a3: Merge "Add Inet Condition log to bugreports" into gingerbread
Merge commit '
313af5a3b5ba51eb75dea35eb568c841aa4beb6a' into gingerbread-plus-aosp
* commit '
313af5a3b5ba51eb75dea35eb568c841aa4beb6a':
Add Inet Condition log to bugreports
Robert Greenwalt [Tue, 21 Sep 2010 04:29:02 +0000 (21:29 -0700)]
Merge "Add Inet Condition log to bugreports" into gingerbread
Irfan Sheriff [Tue, 21 Sep 2010 03:02:32 +0000 (20:02 -0700)]
am
df59f257: Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread
Merge commit '
df59f257583730470085db65c7faf44960c3b32e' into gingerbread-plus-aosp
* commit '
df59f257583730470085db65c7faf44960c3b32e':
DO NOT MERGE Enable debug in StatusBarService
Irfan Sheriff [Tue, 21 Sep 2010 02:51:39 +0000 (19:51 -0700)]
Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread
Mike Lockwood [Tue, 21 Sep 2010 00:19:04 +0000 (17:19 -0700)]
am
307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread
Merge commit '
307aef01257cbba42f095f7020a4a3b753f3807b' into gingerbread-plus-aosp
* commit '
307aef01257cbba42f095f7020a4a3b753f3807b':
LocationManager: Hide location provider and geocode provider APIs.
Mike Lockwood [Tue, 21 Sep 2010 00:16:03 +0000 (17:16 -0700)]
Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread
Dianne Hackborn [Tue, 21 Sep 2010 00:06:12 +0000 (17:06 -0700)]
am
e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread
Merge commit '
e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp
* commit '
e25a264c4e3739913798d9b7d91af5dc964b0f15':
DO NOT MERGE. Wifi service now blames apps for its wake lock use.
Dianne Hackborn [Tue, 21 Sep 2010 00:03:15 +0000 (17:03 -0700)]
Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread
Dianne Hackborn [Mon, 20 Sep 2010 23:57:05 +0000 (16:57 -0700)]
am
4db643eb: Merge "In theory the package manager now scans /vendor/app" into gingerbread
Merge commit '
4db643eb8430d063b1adc4ba164bfa1c1281bdf3' into gingerbread-plus-aosp
* commit '
4db643eb8430d063b1adc4ba164bfa1c1281bdf3':
In theory the package manager now scans /vendor/app
Dianne Hackborn [Mon, 20 Sep 2010 23:54:22 +0000 (16:54 -0700)]
Merge "In theory the package manager now scans /vendor/app" into gingerbread
Scott Main [Mon, 20 Sep 2010 23:40:46 +0000 (16:40 -0700)]
am
a4270e7e: am
73e150c8: provide link to backup guide above the fold
Merge commit '
a4270e7e1e09bf5f60c65102d34e887033c5befa' into gingerbread-plus-aosp
* commit '
a4270e7e1e09bf5f60c65102d34e887033c5befa':
provide link to backup guide above the fold
Scott Main [Mon, 20 Sep 2010 23:37:32 +0000 (16:37 -0700)]
am
73e150c8: provide link to backup guide above the fold
Merge commit '
73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread
* commit '
73e150c886afc6cd92e8b065a58d61e0b2a098ed':
provide link to backup guide above the fold
Dianne Hackborn [Mon, 20 Sep 2010 23:34:45 +0000 (16:34 -0700)]
am
8e1b84e7: Merge "Some battery improvements:" into gingerbread
Merge commit '
8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp
* commit '
8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
Some battery improvements:
Dianne Hackborn [Mon, 20 Sep 2010 23:29:42 +0000 (16:29 -0700)]
Merge "Some battery improvements:" into gingerbread
Mindy Pereira [Mon, 20 Sep 2010 22:49:51 +0000 (15:49 -0700)]
am
d3301e9f: Add mdpi images for overscroll EdgeGlow.
Merge commit '
d3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c' into gingerbread-plus-aosp
* commit '
d3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c':
Add mdpi images for overscroll EdgeGlow.
Steve Howard [Mon, 20 Sep 2010 22:43:43 +0000 (15:43 -0700)]
am
d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread
Merge commit '
d2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp
* commit '
d2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
New error status for "destination file already exists".
Steve Howard [Mon, 20 Sep 2010 22:40:41 +0000 (15:40 -0700)]
Merge "New error status for "destination file already exists"." into gingerbread
John Wang [Mon, 20 Sep 2010 22:38:40 +0000 (15:38 -0700)]
am
ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread
Merge commit '
ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp
* commit '
ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6':
Use PhoneBase in the phone list.
John Wang [Mon, 20 Sep 2010 22:35:02 +0000 (15:35 -0700)]
Merge "Use PhoneBase in the phone list." into gingerbread
Brian Swetland [Mon, 20 Sep 2010 21:08:46 +0000 (14:08 -0700)]
am
181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread
Merge commit '
181e5ea8087360742b3ed0a7f2e6f8f8baa0a760' into gingerbread-plus-aosp
* commit '
181e5ea8087360742b3ed0a7f2e6f8f8baa0a760':
support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
Brian Swetland [Mon, 20 Sep 2010 21:05:25 +0000 (14:05 -0700)]
Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread
Brian Swetland [Mon, 20 Sep 2010 19:58:15 +0000 (12:58 -0700)]
support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
Hung-ying Tyan [Mon, 20 Sep 2010 07:51:07 +0000 (00:51 -0700)]
am
8544560c: SipPhone: fix missing-call DisconnectCause feedback
Merge commit '
8544560ccc43de7ff49d91866f461f5572f0b147' into gingerbread-plus-aosp
* commit '
8544560ccc43de7ff49d91866f461f5572f0b147':
SipPhone: fix missing-call DisconnectCause feedback
Hung-ying Tyan [Mon, 20 Sep 2010 02:14:30 +0000 (19:14 -0700)]
am
b17eae9e: SipService: move event handling out of system server\'s main thread
Merge commit '
b17eae9e227475a323f61519abc8a7d35ddf8828' into gingerbread-plus-aosp
* commit '
b17eae9e227475a323f61519abc8a7d35ddf8828':
SipService: move event handling out of system server's main thread
Hung-ying Tyan [Mon, 20 Sep 2010 01:56:27 +0000 (18:56 -0700)]
am
97963794: SIP: convert enum to static final int.
Merge commit '
97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp
* commit '
97963794af1e18674dd111e3ad344d90b16c922c':
SIP: convert enum to static final int.
Hung-ying Tyan [Mon, 20 Sep 2010 01:11:44 +0000 (18:11 -0700)]
am
5b930c49: Merge "SIP: add config flag for wifi-only configuration." into gingerbread
Merge commit '
5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp
* commit '
5b930c49b12bdb1461a18491db768c642c38d498':
SIP: add config flag for wifi-only configuration.
Hung-ying Tyan [Mon, 20 Sep 2010 01:02:13 +0000 (18:02 -0700)]
Merge "SIP: add config flag for wifi-only configuration." into gingerbread
Mike Lockwood [Sun, 19 Sep 2010 18:10:57 +0000 (11:10 -0700)]
am
ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Merge commit '
ba56dfce7c751081f2289aa33533dcf4822dc12b' into gingerbread-plus-aosp
* commit '
ba56dfce7c751081f2289aa33533dcf4822dc12b':
DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Adam Powell [Sat, 18 Sep 2010 02:30:03 +0000 (19:30 -0700)]
am
4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
Merge commit '
4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp
* commit '
4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
Fix some drawing artifacts/bugs around overlays/text anchors
Jeff Brown [Sat, 18 Sep 2010 02:29:50 +0000 (19:29 -0700)]
am
7d4739be: Merge "Reduce lock thrashing in native Looper." into gingerbread
Merge commit '
7d4739bed5cd5f41ddfa431446b51f61b94d7b0b' into gingerbread-plus-aosp
* commit '
7d4739bed5cd5f41ddfa431446b51f61b94d7b0b':
Reduce lock thrashing in native Looper.
Adam Powell [Sat, 18 Sep 2010 02:15:38 +0000 (19:15 -0700)]
Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
Jeff Brown [Sat, 18 Sep 2010 00:26:02 +0000 (17:26 -0700)]
Merge "Reduce lock thrashing in native Looper." into gingerbread
Jeff Brown [Sat, 18 Sep 2010 00:01:23 +0000 (17:01 -0700)]
Reduce lock thrashing in native Looper.
In the common case, there is nothing interesting happening on the native
Looper besides occasional wake ups. There is no point grabbing the
semaphore then.
Change-Id: Ib5c426d0e158dfa37891b7ff5537b6f833592fad
Adam Powell [Fri, 17 Sep 2010 22:46:07 +0000 (15:46 -0700)]
am
25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread
Merge commit '
25945ca2e67c0e46ff2ad46590cd71ca5b4b4266' into gingerbread-plus-aosp
* commit '
25945ca2e67c0e46ff2ad46590cd71ca5b4b4266':
Fix silly touch bug in TextView. Oops.
Marco Nelissen [Fri, 17 Sep 2010 22:42:21 +0000 (15:42 -0700)]
am
f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit '
f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp
* commit '
f30fae63389a2216faf55636b95a08f35b5c3620':
Add a check to track a problem the monkey script has been triggering.
Adam Powell [Fri, 17 Sep 2010 22:41:11 +0000 (15:41 -0700)]
Merge "Fix silly touch bug in TextView. Oops." into gingerbread
Marco Nelissen [Fri, 17 Sep 2010 22:39:00 +0000 (15:39 -0700)]
Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Dianne Hackborn [Fri, 17 Sep 2010 22:20:10 +0000 (15:20 -0700)]
am
58e0eefe: Improve power tracking of WIFI use.
Merge commit '
58e0eefeb5e2e270e2b04369bbf29fc22abda8d5' into gingerbread-plus-aosp
* commit '
58e0eefeb5e2e270e2b04369bbf29fc22abda8d5':
Improve power tracking of WIFI use.
John Wang [Fri, 17 Sep 2010 22:06:44 +0000 (15:06 -0700)]
am
0741a5ed: Merge "Add debug function." into gingerbread
Merge commit '
0741a5ed38757ef2f6b52945ad494d965b3b83de' into gingerbread-plus-aosp
* commit '
0741a5ed38757ef2f6b52945ad494d965b3b83de':
Add debug function.
John Wang [Fri, 17 Sep 2010 22:03:01 +0000 (15:03 -0700)]
Merge "Add debug function." into gingerbread
Adam Powell [Fri, 17 Sep 2010 21:53:43 +0000 (14:53 -0700)]
am
b08013c3: Added overlay support for drawing/responding to text anchors.
Merge commit '
b08013c312e3d849029a2f4c11889274c00f438d' into gingerbread-plus-aosp
* commit '
b08013c312e3d849029a2f4c11889274c00f438d':
Added overlay support for drawing/responding to text anchors.
Jeff Brown [Fri, 17 Sep 2010 20:30:20 +0000 (13:30 -0700)]
am
838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
Merge commit '
838e93ed19879ce3d88b5be51630137d6a6999c6' into gingerbread-plus-aosp
* commit '
838e93ed19879ce3d88b5be51630137d6a6999c6':
Looper: Drop default parameters in favor of a safer overload.
Jeff Brown [Fri, 17 Sep 2010 20:25:55 +0000 (13:25 -0700)]
Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
Chet Haase [Fri, 17 Sep 2010 20:14:58 +0000 (13:14 -0700)]
am
4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '
4a2b3ef1810135bea25a827d7c52767f50c528b6' into gingerbread-plus-aosp
* commit '
4a2b3ef1810135bea25a827d7c52767f50c528b6':
new assets
Chet Haase [Fri, 17 Sep 2010 20:10:54 +0000 (13:10 -0700)]
Merge "new assets" into gingerbread
Andreas Huber [Fri, 17 Sep 2010 19:50:45 +0000 (12:50 -0700)]
am
f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.
Merge commit '
f98197a7274c2d7da647f52b3d8b0c74492139af' into gingerbread-plus-aosp
* commit '
f98197a7274c2d7da647f52b3d8b0c74492139af':
Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
Andreas Huber [Fri, 17 Sep 2010 19:50:35 +0000 (12:50 -0700)]
am
524e6f62: Register the new OMX components.
Merge commit '
524e6f62c93e9947f3f9de386c6f6be7a3085d3c' into gingerbread-plus-aosp
* commit '
524e6f62c93e9947f3f9de386c6f6be7a3085d3c':
Register the new OMX components.
Hung-ying Tyan [Fri, 17 Sep 2010 09:03:39 +0000 (02:03 -0700)]
am
1d158357: SipPhone: do not append SIP domain to PSTN number
Merge commit '
1d1583573d2099756bbbeef48d97c280edc393e0' into gingerbread-plus-aosp
* commit '
1d1583573d2099756bbbeef48d97c280edc393e0':
SipPhone: do not append SIP domain to PSTN number
Hung-ying Tyan [Fri, 17 Sep 2010 08:01:07 +0000 (01:01 -0700)]
am
afa583e6: SipAudioCall: expose startAudio()
Merge commit '
afa583e6557557577188c3e40146ac8d6f2aa7c7' into gingerbread-plus-aosp
* commit '
afa583e6557557577188c3e40146ac8d6f2aa7c7':
SipAudioCall: expose startAudio()
Tadashi G. Takaoka [Fri, 17 Sep 2010 07:03:32 +0000 (00:03 -0700)]
am
ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Merge commit '
ecd43cca4205a3c32a5e2ee4000bdc31d28e22be' into gingerbread-plus-aosp
* commit '
ecd43cca4205a3c32a5e2ee4000bdc31d28e22be':
Initialize Keyboard.Key attributes from parent Keyboard.Row
Tadashi G. Takaoka [Fri, 17 Sep 2010 07:01:19 +0000 (00:01 -0700)]
Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Brian Carlstrom [Fri, 17 Sep 2010 06:51:31 +0000 (23:51 -0700)]
am
987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread
Merge commit '
987ba54127caaaa87056965b3d98b7e1a5b110b7' into gingerbread-plus-aosp
* commit '
987ba54127caaaa87056965b3d98b7e1a5b110b7':
Fix sim-eng build on Hardy
Brian Carlstrom [Fri, 17 Sep 2010 06:48:53 +0000 (23:48 -0700)]
Merge "Fix sim-eng build on Hardy" into gingerbread
Hung-ying Tyan [Fri, 17 Sep 2010 06:40:28 +0000 (23:40 -0700)]
am
9404e633: Merge "Add timer to SIP session creation process." into gingerbread
Merge commit '
9404e633a55cd325b57732cdd776053b3886b611' into gingerbread-plus-aosp
* commit '
9404e633a55cd325b57732cdd776053b3886b611':
Add timer to SIP session creation process.
Hung-ying Tyan [Fri, 17 Sep 2010 06:30:49 +0000 (23:30 -0700)]
Merge "Add timer to SIP session creation process." into gingerbread
Mathias Agopian [Fri, 17 Sep 2010 05:16:02 +0000 (22:16 -0700)]
am
36f429d3: Fix typo which causes sensors to fail miserably
Merge commit '
36f429d300be2550d7459b488dfc05b00ec59312' into gingerbread-plus-aosp
* commit '
36f429d300be2550d7459b488dfc05b00ec59312':
Fix typo which causes sensors to fail miserably
Jake Hamby [Fri, 17 Sep 2010 05:15:55 +0000 (22:15 -0700)]
am
0f584306: Fix Bluetooth Javadoc to clarify the maximum device name length.
Merge commit '
0f5843069bd419fba4fb253986645dfbca0784b7' into gingerbread-plus-aosp
* commit '
0f5843069bd419fba4fb253986645dfbca0784b7':
Fix Bluetooth Javadoc to clarify the maximum device name length.
Mathias Agopian [Fri, 17 Sep 2010 04:41:13 +0000 (21:41 -0700)]
Fix typo which causes sensors to fail miserably
Change-Id: Ieca18fc089e2bdf7d049f213836971b54d11cd76
Jeff Brown [Fri, 17 Sep 2010 01:28:12 +0000 (18:28 -0700)]
Looper: Drop default parameters in favor of a safer overload.
The idea is that if you're writing code that wants fd/events/data on
return from pollOnce() / pollAll() you should really pass in all of those
arguments. When I changed the Looper API earlier, it was difficult
to ensure that all callers were passing the right parameters since they
were relying on default parameters to some degree so usage mistakes
would not have been caught by the compiler.
Change-Id: I1f2812894270aaf1515017ac1616b6b312d9b565
Mathias Agopian [Fri, 17 Sep 2010 00:57:34 +0000 (17:57 -0700)]
am
1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread
Merge commit '
1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69' into gingerbread-plus-aosp
* commit '
1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69':
surfaceflinger / GL extensions cleanup
Mathias Agopian [Fri, 17 Sep 2010 00:57:29 +0000 (17:57 -0700)]
am
08710dcd: Merge "part of fix for [
3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread
Merge commit '
08710dcd589432c5828cefce25e4b565b15de9a6' into gingerbread-plus-aosp
* commit '
08710dcd589432c5828cefce25e4b565b15de9a6':
part of fix for [
3004226] Cannot end the call - Proximity sensor doesn't work
Mathias Agopian [Fri, 17 Sep 2010 00:57:25 +0000 (17:57 -0700)]
am
079ed615: Merge "fix [
2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
Merge commit '
079ed61579c3c42d78bb20cbcb11e6ffdb2aff34' into gingerbread-plus-aosp
* commit '
079ed61579c3c42d78bb20cbcb11e6ffdb2aff34':
fix [
2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
Mathias Agopian [Fri, 17 Sep 2010 00:55:05 +0000 (17:55 -0700)]
Merge "surfaceflinger / GL extensions cleanup" into gingerbread
Jesse Wilson [Fri, 17 Sep 2010 00:54:55 +0000 (17:54 -0700)]
am
14836fb1: Merge "Add optional tags to frameworks/base ext." into gingerbread
Merge commit '
14836fb17335b147ebc8081fea11fda0d46ce532' into gingerbread-plus-aosp
* commit '
14836fb17335b147ebc8081fea11fda0d46ce532':
Add optional tags to frameworks/base ext.
Mathias Agopian [Fri, 17 Sep 2010 00:54:50 +0000 (17:54 -0700)]
Merge "part of fix for [
3004226] Cannot end the call - Proximity sensor doesn't work" into gingerbread
Mathias Agopian [Fri, 17 Sep 2010 00:54:42 +0000 (17:54 -0700)]
Merge "fix [
2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
Jesse Wilson [Fri, 17 Sep 2010 00:52:29 +0000 (17:52 -0700)]
Merge "Add optional tags to frameworks/base ext." into gingerbread
Mathias Agopian [Fri, 17 Sep 2010 00:04:16 +0000 (17:04 -0700)]
part of fix for [
3004226] Cannot end the call - Proximity sensor doesn't work
- In SensorEventQueue, only bail on errors from Looper::loopOnce
- Improve sensor error logging
Change-Id: Ib3cf8d5d9fdac8513a3d753155827e0feeda1662
Jeff Brown [Fri, 17 Sep 2010 00:15:54 +0000 (17:15 -0700)]
am
1ac48eab: Merge "Ensure input dispatcher and native looper handles EINTR." into gingerbread
Merge commit '
1ac48eabd39e0cfd087ddf2c3b6ba8e56803bdd4' into gingerbread-plus-aosp
* commit '
1ac48eabd39e0cfd087ddf2c3b6ba8e56803bdd4':
Ensure input dispatcher and native looper handles EINTR.
Jeff Brown [Fri, 17 Sep 2010 00:15:48 +0000 (17:15 -0700)]
am
9c258710: Merge "Fix app switch latency optimization." into gingerbread
Merge commit '
9c2587104ae259b9fa6a3525063197cc08e8820b' into gingerbread-plus-aosp
* commit '
9c2587104ae259b9fa6a3525063197cc08e8820b':
Fix app switch latency optimization.
Jeff Brown [Fri, 17 Sep 2010 00:12:31 +0000 (17:12 -0700)]
Merge "Ensure input dispatcher and native looper handles EINTR." into gingerbread
Jeff Brown [Fri, 17 Sep 2010 00:12:24 +0000 (17:12 -0700)]
Merge "Fix app switch latency optimization." into gingerbread
Jeff Brown [Fri, 17 Sep 2010 00:04:52 +0000 (17:04 -0700)]
Ensure input dispatcher and native looper handles EINTR.
Change-Id: I0a42db5f273b9bfe4ab174e4ee65d5d852f9f6bc
Carl Shapiro [Thu, 16 Sep 2010 23:57:37 +0000 (16:57 -0700)]
am
4b164c1b: Kill off the remaining GC-specific system properties.
Merge commit '
4b164c1bf3592d4d83d93a5de58bb09676f1462c' into gingerbread-plus-aosp
* commit '
4b164c1bf3592d4d83d93a5de58bb09676f1462c':
Kill off the remaining GC-specific system properties.
Jeff Brown [Thu, 16 Sep 2010 21:07:33 +0000 (14:07 -0700)]
Fix app switch latency optimization.
This optimization was broken due to recent changes in how ANRs are handled.
Change-Id: Ic99248a12755fadac8d4893e7d305b773e038d3d
Brian Carlstrom [Thu, 16 Sep 2010 23:28:13 +0000 (16:28 -0700)]
Fix sim-eng build on Hardy
Older glibc version do not include BSD htole32 and htole64 which are
present in bionic. This worksaround a sim-eng build issue by only
using htole32/htole64 if the host is not little endian.
Change-Id: Ia8d0d36285f3c34c51a331790458e52a21c2925f
Andreas Huber [Thu, 16 Sep 2010 23:02:33 +0000 (16:02 -0700)]
am
a7516e90: Merge "Make sure the .wav extractor does not read data outside the bounds of the \'data\' box." into gingerbread
Merge commit '
a7516e90d01a22d17a470695eefa905e0ff066cc' into gingerbread-plus-aosp
* commit '
a7516e90d01a22d17a470695eefa905e0ff066cc':
Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
Andreas Huber [Thu, 16 Sep 2010 23:02:25 +0000 (16:02 -0700)]
am
549629d3: Merge "Make sure stagefright -o terminates even if we\'re using a raw audio source (such as .wav pcm)" into gingerbread
Merge commit '
549629d36690ac09498d0a9b2aac4ae4ceb7eead' into gingerbread-plus-aosp
* commit '
549629d36690ac09498d0a9b2aac4ae4ceb7eead':
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
Jeff Brown [Thu, 16 Sep 2010 22:30:18 +0000 (15:30 -0700)]
am
6abea1eb: Remove fields no longer in API.
Merge commit '
6abea1ebc29c7bc8397f0470d57a4e485b5d4ee3' into gingerbread-plus-aosp
* commit '
6abea1ebc29c7bc8397f0470d57a4e485b5d4ee3':
Remove fields no longer in API.
Andreas Huber [Thu, 16 Sep 2010 22:20:33 +0000 (15:20 -0700)]
Merge "Make sure the .wav extractor does not read data outside the bounds of the 'data' box." into gingerbread
Andreas Huber [Thu, 16 Sep 2010 22:20:21 +0000 (15:20 -0700)]
Merge "Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)" into gingerbread
Joe Onorato [Thu, 16 Sep 2010 22:00:50 +0000 (15:00 -0700)]
am
b01e10c5: There is no @note javadoc tag.
Merge commit '
b01e10c5bc0a29d1b0da96783b6d1582baeb2af2' into gingerbread-plus-aosp
* commit '
b01e10c5bc0a29d1b0da96783b6d1582baeb2af2':
There is no @note javadoc tag.
Steve Howard [Thu, 16 Sep 2010 20:45:51 +0000 (13:45 -0700)]
am
47874718: Merge "Support new URI structure for download provider." into gingerbread
Merge commit '
478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp
* commit '
478747181e0414d703076d4786b201718cd93d5b':
Support new URI structure for download provider.
Steve Howard [Thu, 16 Sep 2010 20:42:34 +0000 (13:42 -0700)]
Merge "Support new URI structure for download provider." into gingerbread
Jeff Brown [Thu, 16 Sep 2010 20:01:54 +0000 (13:01 -0700)]
am
24326f72: Merge "Input API review." into gingerbread
Merge commit '
24326f7223275ba9c85014b86d42040e3a7d2815' into gingerbread-plus-aosp
* commit '
24326f7223275ba9c85014b86d42040e3a7d2815':
Input API review.
Jeff Brown [Thu, 16 Sep 2010 19:57:56 +0000 (12:57 -0700)]
Merge "Input API review." into gingerbread
OSDN Git Service
