OSDN Git Service
Andreas Huber [Thu, 7 Oct 2010 21:02:26 +0000 (14:02 -0700)]
am
949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread
Merge commit '
949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp
* commit '
949f7d9066e09768e570686a5695aaba4a1dafd0':
Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
Justin Ho [Thu, 7 Oct 2010 21:02:22 +0000 (14:02 -0700)]
am
b74941e3: Merge "Fixed popup assets (background)" into gingerbread
Merge commit '
b74941e32e068ec03f90b9a53670328cd17ff4b4' into gingerbread-plus-aosp
* commit '
b74941e32e068ec03f90b9a53670328cd17ff4b4':
Fixed popup assets (background)
Adam Powell [Thu, 7 Oct 2010 21:02:15 +0000 (14:02 -0700)]
am
f15dfbec: Merge "Fix bug
3071869 - text anchors are now treated as application sub-panels." into gingerbread
Merge commit '
f15dfbec5df911f4cedd3e302864496d77ce295b' into gingerbread-plus-aosp
* commit '
f15dfbec5df911f4cedd3e302864496d77ce295b':
Fix bug
3071869 - text anchors are now treated as application sub-panels.
Brad Fitzpatrick [Thu, 7 Oct 2010 21:02:10 +0000 (14:02 -0700)]
am
6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread
Merge commit '
6275dbbea8ad7bde984a362516654004e111dc67' into gingerbread-plus-aosp
* commit '
6275dbbea8ad7bde984a362516654004e111dc67':
Quiet unnecessary debug logging.
Andreas Huber [Thu, 7 Oct 2010 21:02:01 +0000 (14:02 -0700)]
am
02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Merge commit '
02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp
* commit '
02654f01bc6bd2e581b4a1d2409ecea217294fa2':
On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
Kenny Root [Thu, 7 Oct 2010 21:01:55 +0000 (14:01 -0700)]
am
e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread
Merge commit '
e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9' into gingerbread-plus-aosp
* commit '
e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9':
Eliminate MCS_GIVE_UP state
Gilles Debunne [Thu, 7 Oct 2010 21:01:48 +0000 (14:01 -0700)]
am
e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread
Merge commit '
e86a6b2a4dc0c01717366c35fd0d6acd778988d4' into gingerbread-plus-aosp
* commit '
e86a6b2a4dc0c01717366c35fd0d6acd778988d4':
Removed unused and broken screen_progress
Brad Fitzpatrick [Thu, 7 Oct 2010 21:01:40 +0000 (14:01 -0700)]
am
30f5c8fe: More DropBoxManager javadoc love.
Merge commit '
30f5c8fede241e7560f4a33e48af3a4627fd5efc' into gingerbread-plus-aosp
* commit '
30f5c8fede241e7560f4a33e48af3a4627fd5efc':
More DropBoxManager javadoc love.
Brad Fitzpatrick [Thu, 7 Oct 2010 21:01:30 +0000 (14:01 -0700)]
am
fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
Merge commit '
fd124570ce647b3adc5dc30ce782d6e017dab4a2' into gingerbread-plus-aosp
* commit '
fd124570ce647b3adc5dc30ce782d6e017dab4a2':
DropBox.Entry javadoc syntax fix
Kenny Root [Thu, 7 Oct 2010 21:01:23 +0000 (14:01 -0700)]
am
0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID"
Merge commit '
0145e36cad1472acafb492b3f009ca6eba9593ea' into gingerbread-plus-aosp
* commit '
0145e36cad1472acafb492b3f009ca6eba9593ea':
Revert "Only allow 8 OBBs to be mounted by a UID"
John Wang [Thu, 7 Oct 2010 21:00:53 +0000 (14:00 -0700)]
am
08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread
Merge commit '
08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp
* commit '
08fb5851bbaf11ecac0cac0de321942bfbf6a630':
Add flag to skip restoring network seletion.
Andreas Huber [Thu, 7 Oct 2010 18:59:53 +0000 (11:59 -0700)]
Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread
Justin Ho [Thu, 7 Oct 2010 18:56:18 +0000 (11:56 -0700)]
Merge "Fixed popup assets (background)" into gingerbread
Adam Powell [Thu, 7 Oct 2010 18:32:49 +0000 (11:32 -0700)]
Merge "Fix bug
3071869 - text anchors are now treated as application sub-panels." into gingerbread
Brad Fitzpatrick [Thu, 7 Oct 2010 18:27:56 +0000 (11:27 -0700)]
Merge "Quiet unnecessary debug logging." into gingerbread
Andreas Huber [Thu, 7 Oct 2010 17:57:32 +0000 (10:57 -0700)]
Merge "On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Kenny Root [Thu, 7 Oct 2010 17:54:14 +0000 (10:54 -0700)]
Merge "Eliminate MCS_GIVE_UP state" into gingerbread
Gilles Debunne [Thu, 7 Oct 2010 17:52:11 +0000 (10:52 -0700)]
Merge "Removed unused and broken screen_progress" into gingerbread
Brad Fitzpatrick [Thu, 7 Oct 2010 17:20:32 +0000 (10:20 -0700)]
Merge "DropBox.Entry javadoc syntax fix" into gingerbread
John Wang [Thu, 7 Oct 2010 16:47:01 +0000 (09:47 -0700)]
Merge "Add flag to skip restoring network seletion." into gingerbread
Eric Rowe [Thu, 7 Oct 2010 16:19:37 +0000 (09:19 -0700)]
am
f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread
Merge commit '
f8d2acdc57fd747278bb909c9e15b959e07d63b6' into gingerbread-plus-aosp
* commit '
f8d2acdc57fd747278bb909c9e15b959e07d63b6':
DO NOT MERGE Initialize bluetooth profiles in BT stress tests
Wink Saville [Thu, 7 Oct 2010 16:16:54 +0000 (09:16 -0700)]
am
bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread
Merge commit '
bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc' into gingerbread-plus-aosp
* commit '
bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc':
Changed handling of onQueryCompelete to not use mimeType.
Eric Rowe [Thu, 7 Oct 2010 16:06:30 +0000 (09:06 -0700)]
Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread
Wink Saville [Thu, 7 Oct 2010 15:34:01 +0000 (08:34 -0700)]
Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread
Wu-cheng Li [Thu, 7 Oct 2010 14:18:39 +0000 (07:18 -0700)]
am
29332971: Merge "Add javadoc for display orientation." into gingerbread
Merge commit '
29332971ddbace4ae3d645a67f28f717df8b1dbd' into gingerbread-plus-aosp
* commit '
29332971ddbace4ae3d645a67f28f717df8b1dbd':
Add javadoc for display orientation.
Hung-ying Tyan [Thu, 7 Oct 2010 14:18:27 +0000 (07:18 -0700)]
am
62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread
Merge commit '
62ec9834a09c9037d195c306fd838b4c0425e7e2' into gingerbread-plus-aosp
* commit '
62ec9834a09c9037d195c306fd838b4c0425e7e2':
Make SipService broadcast SIP_SERVICE_UP when it's up.
Adam Powell [Thu, 7 Oct 2010 14:18:21 +0000 (07:18 -0700)]
am
fbb3b476: Fix bug
3066313 - integrate new text anchor assets.
Merge commit '
fbb3b4768e858f004fe9a87e83b066244c829d87' into gingerbread-plus-aosp
* commit '
fbb3b4768e858f004fe9a87e83b066244c829d87':
Fix bug
3066313 - integrate new text anchor assets.
Dianne Hackborn [Thu, 7 Oct 2010 14:18:08 +0000 (07:18 -0700)]
am
bfba7cab: Fix issue #
3001362: API REVIEW: android.view.InputQueue.Callback
Merge commit '
bfba7cab94cd9cf28e561159dbbe934dc83a6f0a' into gingerbread-plus-aosp
* commit '
bfba7cab94cd9cf28e561159dbbe934dc83a6f0a':
Fix issue #
3001362: API REVIEW: android.view.InputQueue.Callback
Eric Fischer [Thu, 7 Oct 2010 14:16:56 +0000 (07:16 -0700)]
am
70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c' into gingerbread-plus-aosp
* commit '
70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c':
Import revised translations. DO NOT MERGE
Xavier Ducrohet [Thu, 7 Oct 2010 14:16:51 +0000 (07:16 -0700)]
am
656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread
Merge commit '
656d21656ad9b33f7d7e1e4960a2f03076a5fc7a' into gingerbread-plus-aosp
* commit '
656d21656ad9b33f7d7e1e4960a2f03076a5fc7a':
Parser is optional in obtainStyledAttributes.
Hung-ying Tyan [Thu, 7 Oct 2010 14:16:45 +0000 (07:16 -0700)]
am
16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread
Merge commit '
16c29bd7f2ce147fd2f39f1f36df88d1b04a5387' into gingerbread-plus-aosp
* commit '
16c29bd7f2ce147fd2f39f1f36df88d1b04a5387':
SIP: Fix busy authentication loop.
Dianne Hackborn [Thu, 7 Oct 2010 14:16:34 +0000 (07:16 -0700)]
am
9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread
Merge commit '
9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp
* commit '
9d6824cd53960b4562ea3c55876b40ca21710050':
Make Activity.removeDialog() less strict.
Kenny Root [Thu, 7 Oct 2010 14:16:18 +0000 (07:16 -0700)]
am
5919ac6b: OBB: track binder death observers
Merge commit '
5919ac6b4188285324646772501ef4b97b353cf4' into gingerbread-plus-aosp
* commit '
5919ac6b4188285324646772501ef4b97b353cf4':
OBB: track binder death observers
Kenny Root [Thu, 7 Oct 2010 14:16:08 +0000 (07:16 -0700)]
am
a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread
Merge commit '
a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp
* commit '
a3ee5c0351e51f7a978ddddc37644f46051ca6ed':
Add MountService tests and fix a bug it found
Dianne Hackborn [Thu, 7 Oct 2010 14:15:57 +0000 (07:15 -0700)]
am
ef083ec0: Merge "Work on issue #
3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
Merge commit '
ef083ec008a3ec69180340912e7f0137472c97d9' into gingerbread-plus-aosp
* commit '
ef083ec008a3ec69180340912e7f0137472c97d9':
Work on issue #
3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Gilles Debunne [Thu, 7 Oct 2010 14:15:05 +0000 (07:15 -0700)]
am
1ae32bfe: New assets for buttons and notification
Merge commit '
1ae32bfebf5102774cbf6424885f84e4630925c4' into gingerbread-plus-aosp
* commit '
1ae32bfebf5102774cbf6424885f84e4630925c4':
New assets for buttons and notification
Dianne Hackborn [Thu, 7 Oct 2010 14:13:47 +0000 (07:13 -0700)]
am
6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread
Merge commit '
6d44456da87dccb15b4086696f5e72a5aa198926' into gingerbread-plus-aosp
* commit '
6d44456da87dccb15b4086696f5e72a5aa198926':
Make USB mass storage hide keyguard when shown.
Wu-cheng Li [Thu, 7 Oct 2010 12:49:27 +0000 (05:49 -0700)]
Merge "Add javadoc for display orientation." into gingerbread
Hung-ying Tyan [Thu, 7 Oct 2010 06:11:09 +0000 (23:11 -0700)]
Merge "Make SipService broadcast SIP_SERVICE_UP when it's up." into gingerbread
Eric Fischer [Thu, 7 Oct 2010 00:32:17 +0000 (17:32 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Xavier Ducrohet [Thu, 7 Oct 2010 00:32:10 +0000 (17:32 -0700)]
Merge "Parser is optional in obtainStyledAttributes." into gingerbread
Hung-ying Tyan [Thu, 7 Oct 2010 00:29:28 +0000 (17:29 -0700)]
Merge "SIP: Fix busy authentication loop." into gingerbread
Dianne Hackborn [Thu, 7 Oct 2010 00:26:16 +0000 (17:26 -0700)]
Merge "Make Activity.removeDialog() less strict." into gingerbread
Kenny Root [Wed, 6 Oct 2010 23:59:23 +0000 (16:59 -0700)]
Merge "Add MountService tests and fix a bug it found" into gingerbread
Dianne Hackborn [Wed, 6 Oct 2010 23:56:02 +0000 (16:56 -0700)]
Merge "Work on issue #
3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
Dianne Hackborn [Wed, 6 Oct 2010 18:19:51 +0000 (11:19 -0700)]
Merge "Make USB mass storage hide keyguard when shown." into gingerbread
Chung-yih Wang [Wed, 6 Oct 2010 08:52:53 +0000 (01:52 -0700)]
am
18c00089: Merge "Misc fixes for sim-eng build." into gingerbread
Merge commit '
18c000896f9cc77e790b92f29d4ddc18b213e1fb' into gingerbread-plus-aosp
* commit '
18c000896f9cc77e790b92f29d4ddc18b213e1fb':
Misc fixes for sim-eng build.
Chung-yih Wang [Wed, 6 Oct 2010 08:50:25 +0000 (01:50 -0700)]
Merge "Misc fixes for sim-eng build." into gingerbread
Fred Chung [Wed, 6 Oct 2010 06:45:29 +0000 (23:45 -0700)]
am
b50d5ede: am
30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
Merge commit '
b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4' into gingerbread-plus-aosp
* commit '
b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4':
Doc change: Adding new docs for Device Admin API.
Fred Chung [Wed, 6 Oct 2010 06:39:23 +0000 (23:39 -0700)]
am
30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
Merge commit '
30264c9b85109ae58c1e472a747bf47464cc1632' into gingerbread
* commit '
30264c9b85109ae58c1e472a747bf47464cc1632':
Doc change: Adding new docs for Device Admin API.
Fred Chung [Wed, 6 Oct 2010 06:26:41 +0000 (23:26 -0700)]
Merge "Doc change: Adding new docs for Device Admin API." into froyo
Dianne Hackborn [Wed, 6 Oct 2010 02:06:04 +0000 (19:06 -0700)]
am
a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread
Merge commit '
a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9' into gingerbread-plus-aosp
* commit '
a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9':
Fix NPE if there is no accelerometer.
Dianne Hackborn [Wed, 6 Oct 2010 02:02:52 +0000 (19:02 -0700)]
Merge "Fix NPE if there is no accelerometer." into gingerbread
Dianne Hackborn [Wed, 6 Oct 2010 01:59:57 +0000 (18:59 -0700)]
am
4e6baf24: Merge "Fix issue #
3001368: API REVIEW: android.app.Activity" into gingerbread
Merge commit '
4e6baf2473e522e6d53afa01348c564148bfbad7' into gingerbread-plus-aosp
* commit '
4e6baf2473e522e6d53afa01348c564148bfbad7':
Fix issue #
3001368: API REVIEW: android.app.Activity
Dianne Hackborn [Wed, 6 Oct 2010 01:56:54 +0000 (18:56 -0700)]
Merge "Fix issue #
3001368: API REVIEW: android.app.Activity" into gingerbread
Hung-ying Tyan [Wed, 6 Oct 2010 01:37:14 +0000 (18:37 -0700)]
am
fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Merge commit '
fc7e7766e7d6a49d31426f821c0a56168c0d75cc' into gingerbread-plus-aosp
* commit '
fc7e7766e7d6a49d31426f821c0a56168c0d75cc':
CallManager/SipPhone: fix reject a ringing call
Hung-ying Tyan [Wed, 6 Oct 2010 01:33:22 +0000 (18:33 -0700)]
Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Gilles Debunne [Wed, 6 Oct 2010 01:15:12 +0000 (18:15 -0700)]
am
671b2a57: Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread
Merge commit '
671b2a57bb5a2a8669d1dabe65b4080804ee350a' into gingerbread-plus-aosp
* commit '
671b2a57bb5a2a8669d1dabe65b4080804ee350a':
Fix for IndexOutOfBounds in text pasting.
Gilles Debunne [Wed, 6 Oct 2010 01:11:09 +0000 (18:11 -0700)]
Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread
Eric Laurent [Wed, 6 Oct 2010 00:10:59 +0000 (17:10 -0700)]
am
37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
Merge commit '
37947afe904220bdf0a1a85a22824d8619be8e36' into gingerbread-plus-aosp
* commit '
37947afe904220bdf0a1a85a22824d8619be8e36':
Fixed AudioFlinger not always pausing tracks
Eric Laurent [Wed, 6 Oct 2010 00:06:16 +0000 (17:06 -0700)]
Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
Adam Powell [Tue, 5 Oct 2010 23:46:05 +0000 (16:46 -0700)]
am
59c4cb9e: Merge "DO NOT MERGE Fix bug
3001751 and bug
3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit '
59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8' into gingerbread-plus-aosp
* commit '
59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8':
DO NOT MERGE Fix bug
3001751 and bug
3001584 - Gingerbread API review for over-scroll
Adam Powell [Tue, 5 Oct 2010 23:39:24 +0000 (16:39 -0700)]
Merge "DO NOT MERGE Fix bug
3001751 and bug
3001584 - Gingerbread API review for over-scroll" into gingerbread
Adam Powell [Tue, 5 Oct 2010 22:49:23 +0000 (15:49 -0700)]
am
5a5fff71: Fix bug
3064143 - remove default bold on buttons
Merge commit '
5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb' into gingerbread-plus-aosp
* commit '
5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb':
Fix bug
3064143 - remove default bold on buttons
Dianne Hackborn [Tue, 5 Oct 2010 21:45:32 +0000 (14:45 -0700)]
am
930d6c3c: Merge "Fix issue #
3056500: Problem report for ASTRO" into gingerbread
Merge commit '
930d6c3cd5ad387489eb1d35a38beeafe54166b6' into gingerbread-plus-aosp
* commit '
930d6c3cd5ad387489eb1d35a38beeafe54166b6':
Fix issue #
3056500: Problem report for ASTRO
Joe Onorato [Tue, 5 Oct 2010 21:45:28 +0000 (14:45 -0700)]
am
f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread
Merge commit '
f7872780ca3dae9584251b1e3495aed12110254c' into gingerbread-plus-aosp
* commit '
f7872780ca3dae9584251b1e3495aed12110254c':
PowerManagerService needs yet another flag...
Dianne Hackborn [Tue, 5 Oct 2010 21:42:04 +0000 (14:42 -0700)]
Merge "Fix issue #
3056500: Problem report for ASTRO" into gingerbread
Joe Onorato [Tue, 5 Oct 2010 21:41:16 +0000 (14:41 -0700)]
Merge "PowerManagerService needs yet another flag..." into gingerbread
Andreas Huber [Tue, 5 Oct 2010 21:13:16 +0000 (14:13 -0700)]
am
17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Merge commit '
17bc4f65324a823598e7671256c815bf32ddcc95' into gingerbread-plus-aosp
* commit '
17bc4f65324a823598e7671256c815bf32ddcc95':
Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
Andreas Huber [Tue, 5 Oct 2010 21:09:32 +0000 (14:09 -0700)]
Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Kenny Root [Tue, 5 Oct 2010 21:07:29 +0000 (14:07 -0700)]
am
2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
Merge commit '
2c3360fe9c03536cbfd77267170b73c120c071ac' into gingerbread-plus-aosp
* commit '
2c3360fe9c03536cbfd77267170b73c120c071ac':
Remove lingering system app native libs in /data
Kenny Root [Tue, 5 Oct 2010 21:04:26 +0000 (14:04 -0700)]
Merge "Remove lingering system app native libs in /data" into gingerbread
Jeff Brown [Tue, 5 Oct 2010 20:17:04 +0000 (13:17 -0700)]
am
78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread
Merge commit '
78d15acfb20269ce263ce19514a2c0e7a98409e2' into gingerbread-plus-aosp
* commit '
78d15acfb20269ce263ce19514a2c0e7a98409e2':
Make secure views tolerate IME overlays.
Kenny Root [Tue, 5 Oct 2010 20:13:36 +0000 (13:13 -0700)]
am
8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread
Merge commit '
8735c4cda00de26127d694bfbc81e192c4caca44' into gingerbread-plus-aosp
* commit '
8735c4cda00de26127d694bfbc81e192c4caca44':
Get correct native library path on reinstall
Dianne Hackborn [Tue, 5 Oct 2010 20:13:25 +0000 (13:13 -0700)]
am
e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread
Merge commit '
e02e41f484a115b5278dcc07f2d6c90819279800' into gingerbread-plus-aosp
* commit '
e02e41f484a115b5278dcc07f2d6c90819279800':
DO NOT MERGE: Get rid of status bar's dim during night.
Jeff Brown [Tue, 5 Oct 2010 20:06:05 +0000 (13:06 -0700)]
Merge "Make secure views tolerate IME overlays." into gingerbread
Mike Lockwood [Tue, 5 Oct 2010 20:00:13 +0000 (16:00 -0400)]
resolved conflicts for merge of
2f65a99f to gingerbread-plus-aosp
Change-Id: I9830756577dc6a64b03bc2be8788986d9034b059
Kenny Root [Tue, 5 Oct 2010 19:48:46 +0000 (12:48 -0700)]
Merge "Get correct native library path on reinstall" into gingerbread
Dianne Hackborn [Tue, 5 Oct 2010 19:48:40 +0000 (12:48 -0700)]
Merge "DO NOT MERGE: Get rid of status bar's dim during night." into gingerbread
Mike Lockwood [Tue, 5 Oct 2010 19:36:34 +0000 (12:36 -0700)]
Merge changes Ic5551c94,I0207f7f7 into gingerbread
* changes:
GPS: Clean up GPS API extension initialization in JNI code.
GPS: Add support for AGpsRilInterface.
Jeff Brown [Tue, 5 Oct 2010 19:26:23 +0000 (12:26 -0700)]
Make secure views tolerate IME overlays.
Change-Id: I3cf09b9d91045f4d9c558b4aace482a7b0bbd3d8
Robert Greenwalt [Tue, 5 Oct 2010 19:24:47 +0000 (12:24 -0700)]
am
45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread
Merge commit '
45a8901dc3ae12ad818ac2afdd63fe712769cb3b' into gingerbread-plus-aosp
* commit '
45a8901dc3ae12ad818ac2afdd63fe712769cb3b':
Add supporting MCC=450(Korea)
Robert Greenwalt [Tue, 5 Oct 2010 18:46:12 +0000 (11:46 -0700)]
Merge "Add supporting MCC=450(Korea)" into gingerbread
Brett Chabot [Tue, 5 Oct 2010 18:05:37 +0000 (11:05 -0700)]
am
b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit '
b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp
* commit '
b9a40068b590b86904b40bf466571b140d0f94b4':
Failing test cleanup.
Brett Chabot [Tue, 5 Oct 2010 18:00:07 +0000 (11:00 -0700)]
Merge "Failing test cleanup." into gingerbread
Adam Powell [Tue, 5 Oct 2010 06:16:00 +0000 (23:16 -0700)]
am
abcbb1a1: Fix bug
3061544 and some clipping errors.
Merge commit '
abcbb1a1989e8c6adec607b3964dc187f5526e66' into gingerbread-plus-aosp
* commit '
abcbb1a1989e8c6adec607b3964dc187f5526e66':
Fix bug
3061544 and some clipping errors.
Hung-ying Tyan [Tue, 5 Oct 2010 06:07:43 +0000 (23:07 -0700)]
am
718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Merge commit '
718e0033e69fa7d1db12242324ab9098ac430bf5' into gingerbread-plus-aosp
* commit '
718e0033e69fa7d1db12242324ab9098ac430bf5':
SIP: add SERVER_UNREACHABLE error code.
Hung-ying Tyan [Tue, 5 Oct 2010 06:07:39 +0000 (23:07 -0700)]
am
1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Merge commit '
1862af57b2c5ca5387b12974e8ef661651edb97d' into gingerbread-plus-aosp
* commit '
1862af57b2c5ca5387b12974e8ef661651edb97d':
SipService: supply PendingIntent when open a profile.
Dianne Hackborn [Tue, 5 Oct 2010 06:04:53 +0000 (23:04 -0700)]
am
6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Merge commit '
6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283' into gingerbread-plus-aosp
* commit '
6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283':
Make it easier to figure out whether an app can go on sd card.
Hung-ying Tyan [Tue, 5 Oct 2010 06:03:26 +0000 (23:03 -0700)]
Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Hung-ying Tyan [Tue, 5 Oct 2010 06:02:55 +0000 (23:02 -0700)]
Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Dianne Hackborn [Tue, 5 Oct 2010 06:00:25 +0000 (23:00 -0700)]
Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Neal Nguyen [Tue, 5 Oct 2010 04:09:52 +0000 (21:09 -0700)]
am
95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Merge commit '
95037fb1a633f5bdeb4e0ece2d18a4974259c368' into gingerbread-plus-aosp
* commit '
95037fb1a633f5bdeb4e0ece2d18a4974259c368':
Fixing some flakiness of some DL Manager tests.
Neal Nguyen [Tue, 5 Oct 2010 04:07:37 +0000 (21:07 -0700)]
Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Jeff Brown [Tue, 5 Oct 2010 04:05:02 +0000 (21:05 -0700)]
am
79a3981e: Fix Looper leaks in MediaRecorderStressTest.
Merge commit '
79a3981e3885b9144bb3d458682141eed7365939' into gingerbread-plus-aosp
* commit '
79a3981e3885b9144bb3d458682141eed7365939':
Fix Looper leaks in MediaRecorderStressTest.
Mathias Agopian [Tue, 5 Oct 2010 03:21:14 +0000 (20:21 -0700)]
am
f4619308: Merge "fix [
2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit '
f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp
* commit '
f461930872beb4362998642c115691bdd2e94617':
fix [
2835280] Add support for cancelling buffers to ANativeWindow
Mathias Agopian [Tue, 5 Oct 2010 03:18:51 +0000 (20:18 -0700)]
am
ef115308: fix build. SurfaceView.setFrame needed to be hidden
Merge commit '
ef11530874f86570aa04a10c16a416b274b3fdf5' into gingerbread-plus-aosp
* commit '
ef11530874f86570aa04a10c16a416b274b3fdf5':
fix build. SurfaceView.setFrame needed to be hidden
Mathias Agopian [Tue, 5 Oct 2010 03:17:25 +0000 (20:17 -0700)]
Merge "fix [
2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Mathias Agopian [Fri, 1 Oct 2010 23:22:41 +0000 (16:22 -0700)]
fix [
2835280] Add support for cancelling buffers to ANativeWindow
There is a new ANativeWindow::cancelBuffer() API that can be used to
cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is
returned to the list of availlable buffers. dequeue and cancel are not
mutually thread safe, they must be called from the same thread or
external synchronization must be used.
Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
Mathias Agopian [Tue, 5 Oct 2010 03:06:51 +0000 (20:06 -0700)]
am
19058877: Merge "refactored screenshot code" into gingerbread
Merge commit '
19058877df9bf94f197a72855f810f7f6bf8d068' into gingerbread-plus-aosp
* commit '
19058877df9bf94f197a72855f810f7f6bf8d068':
refactored screenshot code
OSDN Git Service
