OSDN Git Service
Wink Saville [Mon, 14 Mar 2011 20:44:50 +0000 (13:44 -0700)]
am
d6398ad3: Merge "Do not merge: Fix 3G connectivity bug
3513741." into honeycomb-LTE
* commit '
d6398ad3ce962a6345d18b166ae8484a4259f6f2':
Do not merge: Fix 3G connectivity bug
3513741.
Wink Saville [Mon, 14 Mar 2011 20:44:48 +0000 (13:44 -0700)]
am
08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE
* commit '
08d79acc462a395a6fb6d0b126eb4d97466962c7':
Do not merge: RIL: Merge Issue. LTE SIM additions.
Wink Saville [Mon, 14 Mar 2011 20:44:45 +0000 (13:44 -0700)]
am
7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE
* commit '
7fbae1d23c99383d0dbaa1be35a41246934e3ce4':
Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
Wink Saville [Mon, 14 Mar 2011 20:44:43 +0000 (13:44 -0700)]
am
16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE
* commit '
16b7f051f71e276f4dd45455e92c33a0894bab10':
Do not merge: LTE: Fix SST for CDMALTEPhone.
Wink Saville [Mon, 14 Mar 2011 20:44:40 +0000 (13:44 -0700)]
am
9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE
* commit '
9e22c33c2b6ff5c9a45ebac88d048f6f61557e82':
Do not merge: Clean up LTE code change
Wink Saville [Mon, 14 Mar 2011 20:44:37 +0000 (13:44 -0700)]
am
c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
* commit '
c3853f36645f2f4f4801d6465e82095cf38ea043':
Do not merge: Add some input checking to prevent problems
Wink Saville [Mon, 14 Mar 2011 20:43:05 +0000 (13:43 -0700)]
Merge "Do not merge: Fix 3G connectivity bug
3513741." into honeycomb-LTE
Wink Saville [Mon, 14 Mar 2011 20:42:50 +0000 (13:42 -0700)]
am
c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE
* commit '
c15cf6353ee1c1cae83039a19fb8d5e5c7d76804':
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
Wink Saville [Mon, 14 Mar 2011 20:42:49 +0000 (13:42 -0700)]
Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE
Wink Saville [Mon, 14 Mar 2011 20:42:24 +0000 (13:42 -0700)]
Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE
Wink Saville [Mon, 14 Mar 2011 20:42:07 +0000 (13:42 -0700)]
Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE
Wink Saville [Mon, 14 Mar 2011 20:41:42 +0000 (13:41 -0700)]
Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE
Wink Saville [Mon, 14 Mar 2011 20:41:26 +0000 (13:41 -0700)]
Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
Gilles Debunne [Mon, 14 Mar 2011 20:41:14 +0000 (13:41 -0700)]
am
816dd3d4: (-s ours) resolved conflicts for merge of
9c06c0ff to gingerbread-plus-aosp
* commit '
816dd3d443108b473965f97123eef7300f53615f':
Double tap on a word no longer opens context menu. DO NOT MERGE
Wink Saville [Mon, 14 Mar 2011 20:40:57 +0000 (13:40 -0700)]
Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE
Gilles Debunne [Mon, 14 Mar 2011 19:57:01 +0000 (12:57 -0700)]
resolved conflicts for merge of
9c06c0ff to gingerbread-plus-aosp
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
Irfan Sheriff [Mon, 14 Mar 2011 18:56:03 +0000 (11:56 -0700)]
am
9b1ea0bd: am
e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
* commit '
9b1ea0bd2c9af64c424fa4fef327108cb376b74f':
Backup and restore IP and proxy settings
Irfan Sheriff [Mon, 14 Mar 2011 18:50:38 +0000 (11:50 -0700)]
am
e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
* commit '
e21110f8b1e4aa884f7a4e2164ae90dab8d5f3fa':
Backup and restore IP and proxy settings
Kenny Root [Mon, 14 Mar 2011 18:49:56 +0000 (11:49 -0700)]
am
206c62ed: am
2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
* commit '
206c62ed34dc8a48fd6c907d95456226949f42dd':
Remove unnecessary SkImageDecoder_libjpeg.cpp
Irfan Sheriff [Mon, 14 Mar 2011 18:48:35 +0000 (11:48 -0700)]
Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
Gilles Debunne [Mon, 14 Mar 2011 18:30:17 +0000 (11:30 -0700)]
Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread
Gilles Debunne [Mon, 14 Mar 2011 18:27:54 +0000 (11:27 -0700)]
am
8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1
* commit '
8503af848657356411a9bb4cf15d798d4f15111b':
Paste popup uses a disabled icon when there is nothing to paste.
Gilles Debunne [Mon, 14 Mar 2011 18:26:36 +0000 (11:26 -0700)]
Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1
Eric Laurent [Mon, 14 Mar 2011 18:23:56 +0000 (11:23 -0700)]
am
3cbfd10b: Merge "Partial fix for issue
3515250: video chat and SCO" into honeycomb-mr1
* commit '
3cbfd10bbb869f763880060ebe01dd66da62bbc3':
Partial fix for issue
3515250: video chat and SCO
Eric Laurent [Mon, 14 Mar 2011 18:21:50 +0000 (11:21 -0700)]
Merge "Partial fix for issue
3515250: video chat and SCO" into honeycomb-mr1
James Dong [Mon, 14 Mar 2011 17:53:51 +0000 (10:53 -0700)]
am
7d93b757: (-s ours) am
68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
* commit '
7d93b7574f741a9cd8872771faefa3c92bed6576':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
Ying Wang [Mon, 14 Mar 2011 17:53:44 +0000 (10:53 -0700)]
am
e5570255: am
69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread
* commit '
e5570255636b60ae2eb56d2f7adf270a8cc40843':
Dist com.android.nfc_extras.jar.
Robert Greenwalt [Mon, 14 Mar 2011 17:53:38 +0000 (10:53 -0700)]
am
2e741556: (-s ours) am
b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from " into gingerbread
* commit '
2e7415564ad1d77537f9f3d5151ed480fcfc6ef9':
DO NOT MERGE Backport of I1f55df8a from master.
Nick Pelly [Mon, 14 Mar 2011 17:28:11 +0000 (10:28 -0700)]
resolved conflicts for merge of
38d0d562 to honeycomb-plus-aosp
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
Mike Lockwood [Mon, 14 Mar 2011 16:44:15 +0000 (09:44 -0700)]
am
3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1
* commit '
3ec9d06f070db3a8899ad235736abd0ffaf6f578':
MtpDevice: Handle zero length packets in readResponse()
Mike Lockwood [Mon, 14 Mar 2011 16:43:14 +0000 (09:43 -0700)]
Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1
Gloria Wang [Mon, 14 Mar 2011 16:35:08 +0000 (09:35 -0700)]
am
7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request
4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin
* commit '
7ea3c7f5a31dcc40d3b5042e3eb724916b66384e':
- Some change on the DrmManager in order to support feature request
4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock.
Gloria Wang [Mon, 14 Mar 2011 16:32:58 +0000 (09:32 -0700)]
Merge "- Some change on the DrmManager in order to support feature request
4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1
Mike Lockwood [Mon, 14 Mar 2011 13:55:24 +0000 (06:55 -0700)]
am
e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
* commit '
e976ff4a2203e5a01c9a1c1a018ba9e5ab7777f7':
Add a dialog to ask user to start an application for a USB device or accessory
Mike Lockwood [Mon, 14 Mar 2011 13:55:21 +0000 (06:55 -0700)]
am
dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1
* commit '
dec0b755fff1bf87aafd397ef0dd864f54c587cf':
MTP host: Fix problems reading large data packets
Mike Lockwood [Mon, 14 Mar 2011 11:02:50 +0000 (04:02 -0700)]
Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
Mike Lockwood [Mon, 14 Mar 2011 11:02:29 +0000 (04:02 -0700)]
Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1
Christopher Tate [Sat, 12 Mar 2011 02:24:49 +0000 (18:24 -0800)]
am
767d7a03: Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1
* commit '
767d7a03733c867da7cad466a9303208eb51699f':
Add a test app: quota exceeded doing a backup
Christopher Tate [Sat, 12 Mar 2011 02:22:37 +0000 (18:22 -0800)]
Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1
Dianne Hackborn [Sat, 12 Mar 2011 02:04:04 +0000 (18:04 -0800)]
am
9ff64838: Merge "Fix issues #
4087362 and #
4087356" into honeycomb-mr1
* commit '
9ff6483843bfa23751b1acf32b169fca9ad97f7f':
Fix issues #
4087362 and #
4087356
Dianne Hackborn [Sat, 12 Mar 2011 02:01:47 +0000 (18:01 -0800)]
Merge "Fix issues #
4087362 and #
4087356" into honeycomb-mr1
Mike Lockwood [Sat, 12 Mar 2011 01:54:23 +0000 (17:54 -0800)]
am
9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1
* commit '
9fffd9a8bb73e9b225878686862d49b27e98c659':
USB: minor cleanup work
Mike Lockwood [Sat, 12 Mar 2011 01:52:36 +0000 (17:52 -0800)]
Merge "USB: minor cleanup work" into honeycomb-mr1
Adam Powell [Sat, 12 Mar 2011 00:41:50 +0000 (16:41 -0800)]
am
87584f51: Merge "Fix bug
4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1
* commit '
87584f51a865cfe8ef19c2b24e858a63cb3e475c':
Fix bug
4083825 - Gesture zoom locked along content edges under some circumstances
Adam Powell [Sat, 12 Mar 2011 00:39:42 +0000 (16:39 -0800)]
Merge "Fix bug
4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1
Glenn Kasten [Sat, 12 Mar 2011 00:34:30 +0000 (16:34 -0800)]
am
76470914: Merge "Bug
3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1
* commit '
7647091436c45af2d82f12c9ea9ec77fa309b49b':
Bug
3515073 Add ANativeWindow_fromSurfaceTexture
Glenn Kasten [Sat, 12 Mar 2011 00:31:55 +0000 (16:31 -0800)]
Merge "Bug
3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1
Kenny Root [Fri, 11 Mar 2011 23:45:34 +0000 (15:45 -0800)]
am
2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
* commit '
2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
Remove unnecessary SkImageDecoder_libjpeg.cpp
Nicolas Roard [Fri, 11 Mar 2011 23:11:14 +0000 (15:11 -0800)]
am
f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1
* commit '
f0230cca194c840684bab959856c56725fc40b87':
HTML5 Video improvements
Nicolas Roard [Fri, 11 Mar 2011 22:35:32 +0000 (14:35 -0800)]
Merge "HTML5 Video improvements" into honeycomb-mr1
James Dong [Fri, 11 Mar 2011 22:31:37 +0000 (14:31 -0800)]
am
68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
* commit '
68f66b945e7a69549689becd2e656d9056f1e7f5':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
Kenny Root [Fri, 11 Mar 2011 22:22:22 +0000 (14:22 -0800)]
Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
Robert Greenwalt [Fri, 11 Mar 2011 22:16:18 +0000 (14:16 -0800)]
Merge "resolved conflicts for merge of
55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Robert Greenwalt [Fri, 11 Mar 2011 22:05:14 +0000 (14:05 -0800)]
resolved conflicts for merge of
55b53d35 to honeycomb-plus-aosp
Change-Id: I7909f30fa5273693d115fd4b565f6c424c95dcc0
James Dong [Fri, 11 Mar 2011 21:38:02 +0000 (13:38 -0800)]
Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
Mike Lockwood [Fri, 11 Mar 2011 21:26:14 +0000 (13:26 -0800)]
am
14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
* commit '
14c875eac750ca096de439225b1a028b1facc58e':
Clear default for USB device/accessory when new matching app is installed
Mike Lockwood [Fri, 11 Mar 2011 21:24:01 +0000 (13:24 -0800)]
Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
Joe Malin [Fri, 11 Mar 2011 21:12:37 +0000 (13:12 -0800)]
am
761b8440: am
9f187296: Merge "DOC CHANGE: Fix
4084450 monkeyrunner_concepts" into honeycomb
* commit '
761b84409135641ec27bb828dbd8a1d04a7252fe':
DOC CHANGE: Fix
4084450 monkeyrunner_concepts
Joe Malin [Fri, 11 Mar 2011 21:10:29 +0000 (13:10 -0800)]
am
9f187296: Merge "DOC CHANGE: Fix
4084450 monkeyrunner_concepts" into honeycomb
* commit '
9f18729676a58cdfcee98db3329de3397c657d48':
DOC CHANGE: Fix
4084450 monkeyrunner_concepts
Joe Malin [Fri, 11 Mar 2011 21:08:59 +0000 (13:08 -0800)]
Merge "DOC CHANGE: Fix
4084450 monkeyrunner_concepts" into honeycomb
Ying Wang [Fri, 11 Mar 2011 20:05:22 +0000 (12:05 -0800)]
am
69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread
* commit '
69e725eb8806180749b66903382754c86a15d0f6':
Dist com.android.nfc_extras.jar.
Robert Greenwalt [Fri, 11 Mar 2011 19:52:31 +0000 (11:52 -0800)]
am
b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from " into gingerbread
* commit '
b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
DO NOT MERGE Backport of I1f55df8a from master.
Mike Lockwood [Fri, 11 Mar 2011 19:37:14 +0000 (11:37 -0800)]
am
0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
* commit '
0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
Mike Lockwood [Fri, 11 Mar 2011 18:57:06 +0000 (10:57 -0800)]
Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
* changes:
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
Christopher Tate [Fri, 11 Mar 2011 18:48:46 +0000 (10:48 -0800)]
am
9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
* commit '
9856fbd40470c9f441b6c38b980210cfdef821e9':
Broaden the filter for wallpaper restore
Christopher Tate [Fri, 11 Mar 2011 18:45:17 +0000 (10:45 -0800)]
Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
Dianne Hackborn [Fri, 11 Mar 2011 18:44:46 +0000 (10:44 -0800)]
am
7b076307: Merge "Fix issue #
4084124: Wingray Often see black screen after market ANR due to
4084121" into honeycomb-mr1
* commit '
7b076307bb1f78d3f5616b7f2f2ad496aa4a33d7':
Fix issue #
4084124: Wingray Often see black screen after market ANR due to
4084121
Dianne Hackborn [Fri, 11 Mar 2011 18:44:42 +0000 (10:44 -0800)]
am
492eb33d: Merge "Fix issue #
4081756: Crash when un-stopping applications" into honeycomb-mr1
* commit '
492eb33d549afa65e630d2f4886b1bdf3d979d04':
Fix issue #
4081756: Crash when un-stopping applications
Dianne Hackborn [Fri, 11 Mar 2011 18:39:46 +0000 (10:39 -0800)]
Merge "Fix issue #
4084124: Wingray Often see black screen after market ANR due to
4084121" into honeycomb-mr1
Dianne Hackborn [Fri, 11 Mar 2011 18:38:52 +0000 (10:38 -0800)]
Merge "Fix issue #
4081756: Crash when un-stopping applications" into honeycomb-mr1
Ying Wang [Fri, 11 Mar 2011 18:17:49 +0000 (10:17 -0800)]
Merge "Dist com.android.nfc_extras.jar." into gingerbread
Robert Greenwalt [Fri, 11 Mar 2011 18:14:28 +0000 (10:14 -0800)]
Merge "DO NOT MERGE Backport of I1f55df8a from " into gingerbread
Glenn Kasten [Fri, 11 Mar 2011 16:44:35 +0000 (08:44 -0800)]
am
92f2f3ff: Merge "Bug
3012968 DRM output control" into honeycomb-mr1
* commit '
92f2f3ff2ea5c5b474722f2055cfee4916010e26':
Bug
3012968 DRM output control
Glenn Kasten [Fri, 11 Mar 2011 16:43:05 +0000 (08:43 -0800)]
Merge "Bug
3012968 DRM output control" into honeycomb-mr1
Mike Lockwood [Fri, 11 Mar 2011 14:02:57 +0000 (06:02 -0800)]
am
364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1
* commit '
364903bac6b9bfde694f1c0c5c40b6a2af628408':
Support for USB accessory URIs
Mike Lockwood [Fri, 11 Mar 2011 13:56:50 +0000 (05:56 -0800)]
Merge "Support for USB accessory URIs" into honeycomb-mr1
Jim Miller [Fri, 11 Mar 2011 07:01:42 +0000 (23:01 -0800)]
am
352987e0: Merge "Fix
3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
* commit '
352987e0889b6fa8862f489bc31ba7e9de8d1cbe':
Fix
3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
Jim Miller [Fri, 11 Mar 2011 06:59:57 +0000 (22:59 -0800)]
Merge "Fix
3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
Justin Ho [Fri, 11 Mar 2011 06:33:43 +0000 (22:33 -0800)]
am
f1093dfd: Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
* commit '
f1093dfd7b15c7f33341a4062987c906c061d65f':
Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF
Justin Ho [Fri, 11 Mar 2011 06:31:29 +0000 (22:31 -0800)]
Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
Justin Ho [Fri, 11 Mar 2011 06:24:51 +0000 (22:24 -0800)]
am
57162cdc: Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
* commit '
57162cdcdeaacc826011f98d0285c6034797f5f3':
Wire up the data activity reporting on wifi icon in status bar.
Justin Ho [Fri, 11 Mar 2011 06:22:57 +0000 (22:22 -0800)]
Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
Adam Powell [Fri, 11 Mar 2011 05:43:45 +0000 (21:43 -0800)]
am
5ec35c17: Merge "Fix bug
4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
* commit '
5ec35c172ad0628b7092ab34f962ff2c063905d8':
Fix bug
4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser
Justin Ho [Fri, 11 Mar 2011 05:41:53 +0000 (21:41 -0800)]
am
dacf0d02: Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
* commit '
dacf0d022f1f78e60fffcd8b6b547743cca51c76':
Updated cellular data indicators with transmission signals Bug: #6699FF
Adam Powell [Fri, 11 Mar 2011 05:40:38 +0000 (21:40 -0800)]
Merge "Fix bug
4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
Justin Ho [Fri, 11 Mar 2011 05:39:24 +0000 (21:39 -0800)]
Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
Huahui Wu [Fri, 11 Mar 2011 05:27:24 +0000 (21:27 -0800)]
am
769e132a: Merge "b/
4080388 Improving the performance of ZoomManager" into honeycomb-mr1
* commit '
769e132ae30b6615353dd6bd7d8779b6ef1b0b31':
b/
4080388 Improving the performance of ZoomManager
Huahui Wu [Fri, 11 Mar 2011 05:25:47 +0000 (21:25 -0800)]
Merge "b/
4080388 Improving the performance of ZoomManager" into honeycomb-mr1
Ken Sumrall [Fri, 11 Mar 2011 03:27:05 +0000 (19:27 -0800)]
am
c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
* commit '
c7fcc5076fb2988fba699a2167d19475fd58ed0b':
Teach the framework to use the new android_reboot() function.
Ken Sumrall [Fri, 11 Mar 2011 03:24:42 +0000 (19:24 -0800)]
Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
Jamie Gennis [Fri, 11 Mar 2011 02:07:57 +0000 (18:07 -0800)]
am
b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
* commit '
b2e606f5f175906ab8c578cb9ba03c728154c50c':
SurfaceFlinger: Respect the PROTECTED gralloc bit.
Jamie Gennis [Fri, 11 Mar 2011 02:06:32 +0000 (18:06 -0800)]
Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
Mathias Agopian [Fri, 11 Mar 2011 01:37:47 +0000 (17:37 -0800)]
am
e90c4998: Merge "fix [
4025681] continuous sensors should not try to send an event as soon as they\'re activated" into honeycomb-mr1
* commit '
e90c4998b514f738b3655e55b51a38119b8c5f23':
fix [
4025681] continuous sensors should not try to send an event as soon as they're activated
Mathias Agopian [Fri, 11 Mar 2011 01:36:15 +0000 (17:36 -0800)]
Merge "fix [
4025681] continuous sensors should not try to send an event as soon as they're activated" into honeycomb-mr1
Teng-Hui Zhu [Fri, 11 Mar 2011 01:13:03 +0000 (17:13 -0800)]
am
2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1
* commit '
2fc7976399e5f0f4c6e1dae528df727e7dcbdc8e':
Inline HTML5 Video support
Teng-Hui Zhu [Fri, 11 Mar 2011 01:10:29 +0000 (17:10 -0800)]
Merge "Inline HTML5 Video support" into honeycomb-mr1
Adam Powell [Fri, 11 Mar 2011 01:07:52 +0000 (17:07 -0800)]
am
cf63b66c: Merge "Fix bug
4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
* commit '
cf63b66cfd49dda473806a3b001db72fca48af5a':
Fix bug
4080407 - Browser stuck after scrolling- page stops responding
Adam Powell [Fri, 11 Mar 2011 01:06:11 +0000 (17:06 -0800)]
Merge "Fix bug
4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
Nick Pelly [Fri, 11 Mar 2011 00:32:28 +0000 (16:32 -0800)]
am
367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).
* commit '
367f41f8f61126c2ab34a34cc676756a9fc23ac2':
Implement new NFC-EE API's as shared library (frameworks/base).
Jamie Gennis [Thu, 10 Mar 2011 01:05:02 +0000 (17:05 -0800)]
SurfaceFlinger: Respect the PROTECTED gralloc bit.
This change makes SurfaceFlinger treat layers for which the active
buffer has the GRALLOC_USAGE_PROTECTED bit set as if they have the
'secure' flag set.
Change-Id: Ic60b6513a63e4bb92ec6ce9fd12fd39b4ba5f674
Bug:
4081304
OSDN Git Service
