OSDN Git Service
Adam Powell [Wed, 13 Oct 2010 00:11:51 +0000 (17:11 -0700)]
am
c417612a: Merge "Fix bug
3083631 - Links no longer get tapped during scale gestures" into gingerbread
Merge commit '
c417612a1abb6281697a9738a1a19eb8814ae8a6' into gingerbread-plus-aosp
* commit '
c417612a1abb6281697a9738a1a19eb8814ae8a6':
Fix bug
3083631 - Links no longer get tapped during scale gestures
Adam Powell [Wed, 13 Oct 2010 00:08:43 +0000 (17:08 -0700)]
Merge "Fix bug
3083631 - Links no longer get tapped during scale gestures" into gingerbread
Jaikumar Ganesh [Tue, 12 Oct 2010 23:50:45 +0000 (16:50 -0700)]
am
1bc3a407: Merge "Fix auto connection priority handling." into gingerbread
Merge commit '
1bc3a407ceb380e35e894f405f544b5b87e980d4' into gingerbread-plus-aosp
* commit '
1bc3a407ceb380e35e894f405f544b5b87e980d4':
Fix auto connection priority handling.
Jaikumar Ganesh [Tue, 12 Oct 2010 23:46:50 +0000 (16:46 -0700)]
Merge "Fix auto connection priority handling." into gingerbread
Jeff Brown [Tue, 12 Oct 2010 23:12:34 +0000 (16:12 -0700)]
am
fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread
Merge commit '
fa3d9557c8178e9c4b9471a76edcf4d48a5b3551' into gingerbread-plus-aosp
* commit '
fa3d9557c8178e9c4b9471a76edcf4d48a5b3551':
Add text selection handles to preloaded drawables.
Jeff Brown [Tue, 12 Oct 2010 23:08:59 +0000 (16:08 -0700)]
Merge "Add text selection handles to preloaded drawables." into gingerbread
Andy Stadler [Tue, 12 Oct 2010 22:25:34 +0000 (15:25 -0700)]
am
8e2be267: Add versionCode and versionName to dumpsys packages
Merge commit '
8e2be267f53bd1d2f1531f56732ead4138ac5c58' into gingerbread-plus-aosp
* commit '
8e2be267f53bd1d2f1531f56732ead4138ac5c58':
Add versionCode and versionName to dumpsys packages
Adam Powell [Tue, 12 Oct 2010 22:03:29 +0000 (15:03 -0700)]
am
fb6431c0: Merge "Fix bug
3064135 - do not allow text handles on TextViews in sub windows." into gingerbread
Merge commit '
fb6431c0298747d240fcdc025575e5f46db95132' into gingerbread-plus-aosp
* commit '
fb6431c0298747d240fcdc025575e5f46db95132':
Fix bug
3064135 - do not allow text handles on TextViews in sub windows.
Adam Powell [Tue, 12 Oct 2010 22:00:30 +0000 (15:00 -0700)]
Merge "Fix bug
3064135 - do not allow text handles on TextViews in sub windows." into gingerbread
Irfan Sheriff [Tue, 12 Oct 2010 21:59:20 +0000 (14:59 -0700)]
am
e22eb863: Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread
Merge commit '
e22eb863dc4419dcaf329e9e28e3dc1f71f82902' into gingerbread-plus-aosp
* commit '
e22eb863dc4419dcaf329e9e28e3dc1f71f82902':
fix start driver for corner cases DO NOT MERGE
Irfan Sheriff [Tue, 12 Oct 2010 21:55:52 +0000 (14:55 -0700)]
Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread
Joe Onorato [Tue, 12 Oct 2010 21:46:23 +0000 (14:46 -0700)]
am
ba799098: Merge changes I76513387,I335fb671 into gingerbread
Merge commit '
ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp
* commit '
ba799098608c7be8ff1e18adfa7dc1f452205a7e':
Remove dead code, and make the animation a setting.
turn off the electron beam
Joe Onorato [Tue, 12 Oct 2010 21:43:24 +0000 (14:43 -0700)]
Merge changes I76513387,I335fb671 into gingerbread
* changes:
Remove dead code, and make the animation a setting.
turn off the electron beam
Wink Saville [Tue, 12 Oct 2010 21:21:10 +0000 (14:21 -0700)]
am
a3100314: Merge "Remove some PII." into gingerbread
Merge commit '
a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp
* commit '
a310031438877a7b70a6ac30eb2f2b33e06907e6':
Remove some PII.
Dirk Dougherty [Tue, 12 Oct 2010 21:18:33 +0000 (14:18 -0700)]
am
354954a0: Merge "Doc change: cherrypick testing changes from Squashed commit of the following:" into gingerbread
Merge commit '
354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp
* commit '
354954a01c533c6789536c141cf330ddf3976e8b':
Doc change: cherrypick testing changes from master. Squashed commit of the following:
Wink Saville [Tue, 12 Oct 2010 21:17:00 +0000 (14:17 -0700)]
Merge "Remove some PII." into gingerbread
Mathias Agopian [Mon, 11 Oct 2010 19:37:43 +0000 (12:37 -0700)]
turn off the electron beam
Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
Dirk Dougherty [Tue, 12 Oct 2010 21:16:05 +0000 (14:16 -0700)]
Merge "Doc change: cherrypick testing changes from Squashed commit of the following:" into gingerbread
John Wang [Tue, 12 Oct 2010 18:55:31 +0000 (11:55 -0700)]
am
844a6b3c: Turn off additional debug.
Merge commit '
844a6b3ccaff1ad1443ad985e4527b733ce97c0e' into gingerbread-plus-aosp
* commit '
844a6b3ccaff1ad1443ad985e4527b733ce97c0e':
Turn off additional debug.
Leon Scroggins [Tue, 12 Oct 2010 18:23:12 +0000 (11:23 -0700)]
am
f348502c: Merge "Allow TextView to do its thing." into gingerbread
Merge commit '
f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59' into gingerbread-plus-aosp
* commit '
f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59':
Allow TextView to do its thing.
Leon Scroggins [Tue, 12 Oct 2010 17:24:48 +0000 (10:24 -0700)]
Merge "Allow TextView to do its thing." into gingerbread
Brad Fitzpatrick [Tue, 12 Oct 2010 15:23:40 +0000 (08:23 -0700)]
am
9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
Merge commit '
9facd2d0847691ae46108713d6a7dc9f51a62135' into gingerbread-plus-aosp
* commit '
9facd2d0847691ae46108713d6a7dc9f51a62135':
StrictMode: link to designing for responsiveness ANR docs
Brad Fitzpatrick [Tue, 12 Oct 2010 15:09:55 +0000 (08:09 -0700)]
Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
Jeff Brown [Tue, 12 Oct 2010 08:04:16 +0000 (01:04 -0700)]
am
03aa28fb: Merge "Improve the input policy handling a bit." into gingerbread
Merge commit '
03aa28fb36589a3d601be08e75c08a24c4344d6f' into gingerbread-plus-aosp
* commit '
03aa28fb36589a3d601be08e75c08a24c4344d6f':
Improve the input policy handling a bit.
Jeff Brown [Tue, 12 Oct 2010 08:01:14 +0000 (01:01 -0700)]
Merge "Improve the input policy handling a bit." into gingerbread
Jeff Brown [Tue, 12 Oct 2010 06:32:49 +0000 (23:32 -0700)]
Improve the input policy handling a bit.
Fixed some issues with Monkeys turning off their own screens. Ook ook!
Added some more comments to explain what's going on.
Change-Id: Id2bc0466161a642a73ef7ef97725d1c81e984b12
Chung-yih Wang [Tue, 12 Oct 2010 04:49:26 +0000 (21:49 -0700)]
am
4367ab00: Set the wifi-only for SIP service as the default config.
Merge commit '
4367ab00edb59f95703e4a8a0f9a1a73dbf13551' into gingerbread-plus-aosp
* commit '
4367ab00edb59f95703e4a8a0f9a1a73dbf13551':
Set the wifi-only for SIP service as the default config.
Hung-ying Tyan [Tue, 12 Oct 2010 03:55:56 +0000 (20:55 -0700)]
am
f5201ab7: Keep original phone number in SipConnection.
Merge commit '
f5201ab71ff4d104265ab126e86afc6b81da8011' into gingerbread-plus-aosp
* commit '
f5201ab71ff4d104265ab126e86afc6b81da8011':
Keep original phone number in SipConnection.
Jeff Brown [Tue, 12 Oct 2010 03:24:38 +0000 (20:24 -0700)]
am
a28d5aff: Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread
Merge commit '
a28d5aff5466a55149b9e6f9cd908fcc225c25ff' into gingerbread-plus-aosp
* commit '
a28d5aff5466a55149b9e6f9cd908fcc225c25ff':
Fix a bug synthesizing cancelation events for motions.
Jeff Brown [Tue, 12 Oct 2010 03:22:02 +0000 (20:22 -0700)]
Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread
Hung-ying Tyan [Tue, 12 Oct 2010 03:04:28 +0000 (20:04 -0700)]
am
ece7e11b: Merge "SipService: fix a missing switch-case break." into gingerbread
Merge commit '
ece7e11b3723140b31d28bae6ed6f1ae30e5d802' into gingerbread-plus-aosp
* commit '
ece7e11b3723140b31d28bae6ed6f1ae30e5d802':
SipService: fix a missing switch-case break.
Hung-ying Tyan [Tue, 12 Oct 2010 03:02:05 +0000 (20:02 -0700)]
Merge "SipService: fix a missing switch-case break." into gingerbread
Dianne Hackborn [Tue, 12 Oct 2010 02:17:05 +0000 (19:17 -0700)]
am
ffbc4b94: Merge "Fix SD card mounting issues #
3074555 and #
3072332" into gingerbread
Merge commit '
ffbc4b948d0214c28df382f9eb209ea8f5ceef83' into gingerbread-plus-aosp
* commit '
ffbc4b948d0214c28df382f9eb209ea8f5ceef83':
Fix SD card mounting issues #
3074555 and #
3072332
Dianne Hackborn [Tue, 12 Oct 2010 02:13:33 +0000 (19:13 -0700)]
Merge "Fix SD card mounting issues #
3074555 and #
3072332" into gingerbread
Jeff Brown [Tue, 12 Oct 2010 01:22:53 +0000 (18:22 -0700)]
Fix a bug synthesizing cancelation events for motions.
Change-Id: I881c0fa16c1d22c4b1b6cca24deb0105405ff5b0
Kenny Root [Tue, 12 Oct 2010 00:43:05 +0000 (17:43 -0700)]
am
de846ac6: Merge "Change to new binder implementation for OBB" into gingerbread
Merge commit '
de846ac659e8c14d898a3fa14bd0504b24096057' into gingerbread-plus-aosp
* commit '
de846ac659e8c14d898a3fa14bd0504b24096057':
Change to new binder implementation for OBB
Kenny Root [Tue, 12 Oct 2010 00:40:53 +0000 (17:40 -0700)]
Merge "Change to new binder implementation for OBB" into gingerbread
Kenny Root [Tue, 12 Oct 2010 00:31:06 +0000 (17:31 -0700)]
am
b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbread
Merge commit '
b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp
* commit '
b4de3dca96b9ff18562062e181dcd8b83e641e45':
OBB: rearrange to be entirely asynchronous
Joe Onorato [Tue, 12 Oct 2010 00:26:59 +0000 (17:26 -0700)]
am
1169f420: Merge "Add animation for the status bar going away." into gingerbread
Merge commit '
1169f420f6df5cf5254fed883efa7e6780473c08' into gingerbread-plus-aosp
* commit '
1169f420f6df5cf5254fed883efa7e6780473c08':
Add animation for the status bar going away.
Jeff Brown [Tue, 12 Oct 2010 00:26:51 +0000 (17:26 -0700)]
am
1da8d4d1: Merge "Fix an event injection bug when the policy is bypassed." into gingerbread
Merge commit '
1da8d4d1697cec871dea8c30dad67e90db10bde6' into gingerbread-plus-aosp
* commit '
1da8d4d1697cec871dea8c30dad67e90db10bde6':
Fix an event injection bug when the policy is bypassed.
Joe Onorato [Tue, 12 Oct 2010 00:26:38 +0000 (17:26 -0700)]
am
44104df1: Merge "Fix status bar flashing after orientation change" into gingerbread
Merge commit '
44104df10660c711129fd263364afc2174f40ac2' into gingerbread-plus-aosp
* commit '
44104df10660c711129fd263364afc2174f40ac2':
Fix status bar flashing after orientation change
Kenny Root [Tue, 12 Oct 2010 00:26:07 +0000 (17:26 -0700)]
am
a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbread
Merge commit '
a4e95dfea4f3635d6cb845873fce0566c20cc88e' into gingerbread-plus-aosp
* commit '
a4e95dfea4f3635d6cb845873fce0566c20cc88e':
Grant URI permissions to the MCS
Kenny Root [Tue, 12 Oct 2010 00:24:54 +0000 (17:24 -0700)]
Merge "OBB: rearrange to be entirely asynchronous" into gingerbread
Joe Onorato [Mon, 11 Oct 2010 23:37:41 +0000 (16:37 -0700)]
Merge "Add animation for the status bar going away." into gingerbread
Jeff Brown [Mon, 11 Oct 2010 23:27:36 +0000 (16:27 -0700)]
Merge "Fix an event injection bug when the policy is bypassed." into gingerbread
Joe Onorato [Mon, 11 Oct 2010 23:26:36 +0000 (16:26 -0700)]
Merge "Fix status bar flashing after orientation change" into gingerbread
Jeff Brown [Mon, 11 Oct 2010 21:20:19 +0000 (14:20 -0700)]
Fix an event injection bug when the policy is bypassed.
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.
Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
Kenny Root [Mon, 11 Oct 2010 22:49:30 +0000 (15:49 -0700)]
Merge "Grant URI permissions to the MCS" into gingerbread
Jean-Baptiste Queru [Mon, 11 Oct 2010 22:32:12 +0000 (15:32 -0700)]
am
15f7ff3c: Merge "Fix compile errors in telephony tests"
Merge commit '
15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f' into gingerbread-plus-aosp
* commit '
15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f':
Fix compile errors in telephony tests
Joe Onorato [Mon, 11 Oct 2010 22:22:30 +0000 (15:22 -0700)]
am
c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit '
c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp
* commit '
c0ad216c8ebc74b59074a7538533605eebfd65c3':
Add a configuration option to turn on the screen when you unplug the device.
Joe Onorato [Mon, 11 Oct 2010 22:19:47 +0000 (15:19 -0700)]
Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Scott Main [Mon, 11 Oct 2010 22:15:09 +0000 (15:15 -0700)]
am
3d90d11a: am
3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
Merge commit '
3d90d11a7b6d2b1c49e5890306a06f01646392b0' into gingerbread-plus-aosp
* commit '
3d90d11a7b6d2b1c49e5890306a06f01646392b0':
Revert "docs: new web apps dev guides" Do not merge.
Jean-Baptiste Queru [Mon, 11 Oct 2010 22:11:59 +0000 (15:11 -0700)]
Merge "Fix compile errors in telephony tests"
Scott Main [Mon, 11 Oct 2010 22:04:20 +0000 (15:04 -0700)]
am
3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
Merge commit '
3fd40ee692ed1d4bca40e184119b0d1368671037' into gingerbread
* commit '
3fd40ee692ed1d4bca40e184119b0d1368671037':
Revert "docs: new web apps dev guides" Do not merge.
Chris Tate [Mon, 11 Oct 2010 21:45:22 +0000 (14:45 -0700)]
am
0a789236: Merge "Temporarily turn on backup/restore debug logs" into gingerbread
Merge commit '
0a7892367f46e3653e9857195ec19356f848b7f8' into gingerbread-plus-aosp
* commit '
0a7892367f46e3653e9857195ec19356f848b7f8':
Temporarily turn on backup/restore debug logs
Chris Tate [Mon, 11 Oct 2010 21:42:00 +0000 (14:42 -0700)]
Merge "Temporarily turn on backup/restore debug logs" into gingerbread
Mathias Agopian [Mon, 11 Oct 2010 21:40:02 +0000 (14:40 -0700)]
am
cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
Merge commit '
cf6b2765ae7ea6305754e253264012b8f0498f7b' into gingerbread-plus-aosp
* commit '
cf6b2765ae7ea6305754e253264012b8f0498f7b':
fix a bug where FLIP_H would do a 180 rotation
Mathias Agopian [Mon, 11 Oct 2010 21:37:57 +0000 (14:37 -0700)]
Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
Mathias Agopian [Mon, 11 Oct 2010 21:19:24 +0000 (14:19 -0700)]
fix a bug where FLIP_H would do a 180 rotation
Change-Id: Ie2cc4a8543a5625750c8596f87edcb66fcbca31f
Mathias Agopian [Mon, 11 Oct 2010 21:17:25 +0000 (14:17 -0700)]
am
d0528b74: Merge "deliver invalidate messages AFTER other messages" into gingerbread
Merge commit '
d0528b74b6de87c415ea498095e142d52c68875b' into gingerbread-plus-aosp
* commit '
d0528b74b6de87c415ea498095e142d52c68875b':
deliver invalidate messages AFTER other messages
Mathias Agopian [Mon, 11 Oct 2010 21:15:04 +0000 (14:15 -0700)]
Merge "deliver invalidate messages AFTER other messages" into gingerbread
Mathias Agopian [Mon, 11 Oct 2010 21:11:15 +0000 (14:11 -0700)]
deliver invalidate messages AFTER other messages
because invalidate messages were always handled first, they
could prevent other messages to get through entirely.
there is no real reason to handle invalidate messages first because
the other messages are very uncommon and won't interfer with
updates.
Change-Id: Ib95cdf35a91407bd2f4d69dd082c5f546e1e0071
Joe Onorato [Mon, 11 Oct 2010 20:55:15 +0000 (13:55 -0700)]
am
446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread
Merge commit '
446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp
* commit '
446547af37fd10142f15f6a9b3ac3007c6473981':
Don't throw when userActivity fails because of the permission check.
Joe Onorato [Mon, 11 Oct 2010 20:52:34 +0000 (13:52 -0700)]
Merge "Don't throw when userActivity fails because of the permission check." into gingerbread
Brad Fitzpatrick [Mon, 11 Oct 2010 20:49:12 +0000 (13:49 -0700)]
am
6bb7a4a6: Go one day into 1970 for timezone code.
Merge commit '
6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe' into gingerbread-plus-aosp
* commit '
6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe':
Go one day into 1970 for timezone code.
Brad Fitzpatrick [Mon, 11 Oct 2010 20:03:15 +0000 (13:03 -0700)]
am
ce2f1909: Merge "On boot, advance time to at least 1970." into gingerbread
Merge commit '
ce2f1909c74a1b90995f06a865d21260b062300b' into gingerbread-plus-aosp
* commit '
ce2f1909c74a1b90995f06a865d21260b062300b':
On boot, advance time to at least 1970.
Brad Fitzpatrick [Mon, 11 Oct 2010 20:00:51 +0000 (13:00 -0700)]
Merge "On boot, advance time to at least 1970." into gingerbread
Mathias Agopian [Mon, 11 Oct 2010 19:44:23 +0000 (12:44 -0700)]
am
a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
Merge commit '
a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c' into gingerbread-plus-aosp
* commit '
a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c':
fix a bug where timeouts would only be handled when a message was delivered
Mathias Agopian [Mon, 11 Oct 2010 19:41:33 +0000 (12:41 -0700)]
Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
Mathias Agopian [Fri, 8 Oct 2010 02:59:06 +0000 (19:59 -0700)]
fix a bug where timeouts would only be handled when a message was delivered
Change-Id: I98c69b129e75e065e61f47e54f0f855d9401b0dc
Andreas Huber [Mon, 11 Oct 2010 19:37:50 +0000 (12:37 -0700)]
am
1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
Merge commit '
1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp
* commit '
1010da2e02216b2f94fbe763a82d53201b340217':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
Andreas Huber [Mon, 11 Oct 2010 19:36:03 +0000 (12:36 -0700)]
Merge "Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
Mike Lockwood [Mon, 11 Oct 2010 19:05:20 +0000 (12:05 -0700)]
am
86564dc6: Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread
Merge commit '
86564dc673db6dd752c326e53404677a3db43bec' into gingerbread-plus-aosp
* commit '
86564dc673db6dd752c326e53404677a3db43bec':
GPS: Add update_network_state call to AGpsRillInterface
Brad Fitzpatrick [Mon, 11 Oct 2010 19:05:14 +0000 (12:05 -0700)]
am
5804b4fd: Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
Merge commit '
5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0' into gingerbread-plus-aosp
* commit '
5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0':
StrictMode: check max-offenses-per-loop earlier, before allocations
Mike Lockwood [Mon, 11 Oct 2010 18:56:47 +0000 (11:56 -0700)]
Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread
Brad Fitzpatrick [Mon, 11 Oct 2010 18:56:40 +0000 (11:56 -0700)]
Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
Xia Wang [Mon, 11 Oct 2010 17:32:04 +0000 (10:32 -0700)]
am
c8511af0: Merge "Add mock ril control commands and tests" into gingerbread
Merge commit '
c8511af04a442551a204b1f47fabb317bcf54be0' into gingerbread-plus-aosp
* commit '
c8511af04a442551a204b1f47fabb317bcf54be0':
Add mock ril control commands and tests
Xia Wang [Mon, 11 Oct 2010 17:28:20 +0000 (10:28 -0700)]
Merge "Add mock ril control commands and tests" into gingerbread
Jean-Baptiste Queru [Mon, 11 Oct 2010 16:38:10 +0000 (09:38 -0700)]
resolved conflicts for merge of
e3cfd35b to gingerbread-plus-aosp
Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea
Jean-Baptiste Queru [Mon, 11 Oct 2010 16:15:50 +0000 (09:15 -0700)]
Merge "Dismissing AlertDialog before destroying WebView."
Hung-ying Tyan [Mon, 11 Oct 2010 06:38:04 +0000 (23:38 -0700)]
am
692cac9f: SipHelper: add debug log for challenge responses.
Merge commit '
692cac9fdd7b179ba807351772fdf2339c000dfe' into gingerbread-plus-aosp
* commit '
692cac9fdd7b179ba807351772fdf2339c000dfe':
SipHelper: add debug log for challenge responses.
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:51:47 +0000 (18:51 -0700)]
am
65f23e71: Merge "Corrected visibility reporting error in WindowManager"
Merge commit '
65f23e71bdf7d9ca8c4aa8ed126ac2bc9a2cbf43' into gingerbread-plus-aosp
* commit '
65f23e71bdf7d9ca8c4aa8ed126ac2bc9a2cbf43':
Corrected visibility reporting error in WindowManager
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:51:43 +0000 (18:51 -0700)]
am
2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Merge commit '
2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp
* commit '
2aaa1ce1768d3425c07e55d43aaa400282424f8c':
Hold partial wakelock during shutdown to avoid entering sleep
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:44:00 +0000 (18:44 -0700)]
Merge "Corrected visibility reporting error in WindowManager"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:41:58 +0000 (18:41 -0700)]
Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:37:41 +0000 (18:37 -0700)]
am
0e430ccc: Merge "Telephony: Fix radio state printing"
Merge commit '
0e430ccc2c8a4bb9d96002676d7742652bd28477' into gingerbread-plus-aosp
* commit '
0e430ccc2c8a4bb9d96002676d7742652bd28477':
Telephony: Fix radio state printing
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:37:37 +0000 (18:37 -0700)]
am
fb1e5529: Merge "Fix time zone info in kernel is nothing after reboot"
Merge commit '
fb1e5529724d121aa47485e7245b69965088fbb4' into gingerbread-plus-aosp
* commit '
fb1e5529724d121aa47485e7245b69965088fbb4':
Fix time zone info in kernel is nothing after reboot
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:32:39 +0000 (18:32 -0700)]
Merge "Telephony: Fix radio state printing"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:24:01 +0000 (18:24 -0700)]
am
334a4d84: Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"
Merge commit '
334a4d84df457f0b2b6f89a6930c9ec05a637e5a' into gingerbread-plus-aosp
* commit '
334a4d84df457f0b2b6f89a6930c9ec05a637e5a':
Telephony: Remove unused mRuimFileHandler reference from CDMAPhone
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:20:55 +0000 (18:20 -0700)]
Merge "Fix time zone info in kernel is nothing after reboot"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:15:17 +0000 (18:15 -0700)]
Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"
Gilles Debunne [Mon, 11 Oct 2010 01:08:25 +0000 (18:08 -0700)]
am
6b8bdaa9: New AppsPermission and market style
Merge commit '
6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp
* commit '
6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
New AppsPermission and market style
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:45:45 +0000 (17:45 -0700)]
resolved conflicts for merge of
c2894474 to gingerbread-plus-aosp
Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:22:11 +0000 (17:22 -0700)]
Merge "Support showing "Cold" battery health."
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:00:59 +0000 (17:00 -0700)]
am
bd1454f5: Merge "Include debugger connection status in error entry"
Merge commit '
bd1454f5005619b69d887fee6a7a4891b3323d18' into gingerbread-plus-aosp
* commit '
bd1454f5005619b69d887fee6a7a4891b3323d18':
Include debugger connection status in error entry
Jean-Baptiste Queru [Sun, 10 Oct 2010 23:49:54 +0000 (16:49 -0700)]
Merge "Include debugger connection status in error entry"
David Brown [Sun, 10 Oct 2010 23:44:01 +0000 (16:44 -0700)]
am
d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit '
d07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp
* commit '
d07833f54b6e8e361b666ae16efa15fdf60159de':
Don't manually create CallerInfo objects from SipPhone
Mike Lockwood [Sun, 10 Oct 2010 23:41:28 +0000 (16:41 -0700)]
am
2f77c3e4: Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread
Merge commit '
2f77c3e4de3d68904a6a872d53283775b3a5c349' into gingerbread-plus-aosp
* commit '
2f77c3e4de3d68904a6a872d53283775b3a5c349':
GPS: Fix another race condition in GPS HAL initialization
Justin Ho [Sun, 10 Oct 2010 23:38:14 +0000 (16:38 -0700)]
am
5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
Merge commit '
5c61228bfc0fb26ae2e975cb5c6c74debf6233df' into gingerbread-plus-aosp
* commit '
5c61228bfc0fb26ae2e975cb5c6c74debf6233df':
Updated media playback controls, unlock screen, misc framework assets
Mike Lockwood [Sun, 10 Oct 2010 23:32:49 +0000 (16:32 -0700)]
Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread
OSDN Git Service
