OSDN Git Service
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.
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
Justin Ho [Sun, 10 Oct 2010 23:30:01 +0000 (16:30 -0700)]
Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
Vasu Nori [Sun, 10 Oct 2010 22:54:26 +0000 (15:54 -0700)]
am
b8f7a483: Merge "bug:
3082865 don\'t use IN to construct sql to delete downloads" into gingerbread
Merge commit '
b8f7a4831ac26d0447fd8a2982416b2627a286b5' into gingerbread-plus-aosp
* commit '
b8f7a4831ac26d0447fd8a2982416b2627a286b5':
bug:
3082865 don't use IN to construct sql to delete downloads
Vasu Nori [Sun, 10 Oct 2010 22:51:42 +0000 (15:51 -0700)]
Merge "bug:
3082865 don't use IN to construct sql to delete downloads" into gingerbread
Brad Fitzpatrick [Sun, 10 Oct 2010 22:30:55 +0000 (15:30 -0700)]
am
dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.
Merge commit '
dd644c179c1bf47d82d776d7f644e4fc1467159d' into gingerbread-plus-aosp
* commit '
dd644c179c1bf47d82d776d7f644e4fc1467159d':
Fallback to SharedPreferences$Editor.commit() when no apply() exists.
Xavier Ducrohet [Sun, 10 Oct 2010 22:19:58 +0000 (15:19 -0700)]
am
4e1658af: Merge "Avoid pre-processing images when they won\'t be used" into gingerbread
Merge commit '
4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d' into gingerbread-plus-aosp
* commit '
4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d':
Avoid pre-processing images when they won't be used
Xavier Ducrohet [Sun, 10 Oct 2010 22:14:34 +0000 (15:14 -0700)]
Merge "Avoid pre-processing images when they won't be used" into gingerbread
Jeff Brown [Sun, 10 Oct 2010 21:50:38 +0000 (14:50 -0700)]
am
1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread
Merge commit '
1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32' into gingerbread-plus-aosp
* commit '
1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32':
Added more robust tracking and cancelation of events.
Jeff Brown [Sun, 10 Oct 2010 21:47:57 +0000 (14:47 -0700)]
Merge "Added more robust tracking and cancelation of events." into gingerbread
Jeff Brown [Sat, 9 Oct 2010 05:31:17 +0000 (22:31 -0700)]
Added more robust tracking and cancelation of events.
This change fixes several issues where events would be dropped in the
input dispatch pipeline in such a way that the dispatcher could not
accurately track the state of the input device.
Given more robust tracking, we can now also provide robust cancelation
of input events in cases where an application might otherwise become
out of sync with the event stream due to ANR, app switch, policy decisions,
or forced focus transitions.
Pruned some of the input dispatcher log output.
Moved the responsibility for calling intercept*BeforeQueueing into
the input dispatcher instead of the input reader and added support for
early interception of injected events for events coming from trusted
sources. This enables behaviors like injection of media keys while
the screen is off, haptic feedback of injected virtual keys, so injected
events become more "first class" in a way.
Change-Id: Iec6ff1dd21e5f3c7feb80ea4feb5382bd090dbd9
Gilles Debunne [Sun, 10 Oct 2010 21:04:25 +0000 (14:04 -0700)]
am
b72a335a: Merge "Voice input replaces selected text." into gingerbread
Merge commit '
b72a335a7f11176838d2d12e7295344c092c62ac' into gingerbread-plus-aosp
* commit '
b72a335a7f11176838d2d12e7295344c092c62ac':
Voice input replaces selected text.
Gilles Debunne [Sun, 10 Oct 2010 21:01:10 +0000 (14:01 -0700)]
Merge "Voice input replaces selected text." into gingerbread
Mike Lockwood [Sun, 10 Oct 2010 20:16:22 +0000 (13:16 -0700)]
am
66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread
Merge commit '
66e606040a521b81033ff75025620436c050c82e' into gingerbread-plus-aosp
* commit '
66e606040a521b81033ff75025620436c050c82e':
GPS: More HAL initialization cleanup
Mike Lockwood [Sun, 10 Oct 2010 20:13:16 +0000 (13:13 -0700)]
Merge "GPS: More HAL initialization cleanup" into gingerbread
Wink Saville [Sun, 10 Oct 2010 19:47:18 +0000 (12:47 -0700)]
am
96619f9f: Merge "Add some error-case logging." into gingerbread
Merge commit '
96619f9f0653a5c7f407c52ab565b5ddf23ad696' into gingerbread-plus-aosp
* commit '
96619f9f0653a5c7f407c52ab565b5ddf23ad696':
Add some error-case logging.
Wink Saville [Sun, 10 Oct 2010 19:27:34 +0000 (12:27 -0700)]
Merge "Add some error-case logging." into gingerbread
Irfan Sheriff [Sun, 10 Oct 2010 19:25:15 +0000 (12:25 -0700)]
am
7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" into gingerbread
Merge commit '
7efff5c4c571d1a0111e31d73a87d27e1fae9de6' into gingerbread-plus-aosp
* commit '
7efff5c4c571d1a0111e31d73a87d27e1fae9de6':
fix getmacaddress race condition (don't auto-merge)
Mindy Pereira [Sun, 10 Oct 2010 19:22:46 +0000 (12:22 -0700)]
am
7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% of the total available.
Merge commit '
7a64e3a6f3e9f4de9cb097f604187d06268c23be' into gingerbread-plus-aosp
* commit '
7a64e3a6f3e9f4de9cb097f604187d06268c23be':
DO NOT MERGE Set the cap at alpha to 80% of the total available.
Irfan Sheriff [Sun, 10 Oct 2010 19:21:51 +0000 (12:21 -0700)]
Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbread
Brad Fitzpatrick [Sun, 10 Oct 2010 18:49:43 +0000 (11:49 -0700)]
am
3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"
Merge commit '
3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp
* commit '
3ed792d59cda9f9023201d80f5bdc62d4cef3090':
Don't perform DNS lookup in android.net.Proxy.isLocalHost
John Wang [Sun, 10 Oct 2010 18:42:10 +0000 (11:42 -0700)]
am
df512214: Merge "Fix startDtmf." into gingerbread
Merge commit '
df5122147c6e1c988c6a8504e71501cbbece5298' into gingerbread-plus-aosp
* commit '
df5122147c6e1c988c6a8504e71501cbbece5298':
Fix startDtmf.
John Wang [Sun, 10 Oct 2010 18:38:39 +0000 (11:38 -0700)]
Merge "Fix startDtmf." into gingerbread
Brad Fitzpatrick [Sun, 10 Oct 2010 18:15:27 +0000 (11:15 -0700)]
Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost"
Gilles Debunne [Sun, 10 Oct 2010 18:05:38 +0000 (11:05 -0700)]
am
d14230f1: Merge "Made paste work in ExtractEditText" into gingerbread
Merge commit '
d14230f1c7aa5073db9d291f8fbd6da5491955b9' into gingerbread-plus-aosp
* commit '
d14230f1c7aa5073db9d291f8fbd6da5491955b9':
Made paste work in ExtractEditText
Gilles Debunne [Sun, 10 Oct 2010 17:51:52 +0000 (10:51 -0700)]
Merge "Made paste work in ExtractEditText" into gingerbread
Mike Lockwood [Sun, 10 Oct 2010 00:20:56 +0000 (17:20 -0700)]
am
1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread
Merge commit '
1c3ef78782cb3461ef83e0c337d03b6f677c94e5' into gingerbread-plus-aosp
* commit '
1c3ef78782cb3461ef83e0c337d03b6f677c94e5':
GPS: Do not call sGpsInterface->init() multiple times
Mike Lockwood [Sun, 10 Oct 2010 00:15:54 +0000 (17:15 -0700)]
Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread
Chung-yih Wang [Sat, 9 Oct 2010 06:30:05 +0000 (23:30 -0700)]
am
dc2e5208: Merge "Do not release the wifi lock if the screen is off." into gingerbread
Merge commit '
dc2e5208e2b448a2c481d726818de79ea6a49783' into gingerbread-plus-aosp
* commit '
dc2e5208e2b448a2c481d726818de79ea6a49783':
Do not release the wifi lock if the screen is off.
Chung-yih Wang [Sat, 9 Oct 2010 06:25:11 +0000 (23:25 -0700)]
Merge "Do not release the wifi lock if the screen is off." into gingerbread
Scott Main [Sat, 9 Oct 2010 00:36:00 +0000 (17:36 -0700)]
am
bed5af7e: am
456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit '
bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6' into gingerbread-plus-aosp
* commit '
bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Scott Main [Sat, 9 Oct 2010 00:27:28 +0000 (17:27 -0700)]
am
456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit '
456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread
* commit '
456fe3b337ef82aaf90c6428ec5be07028fc7d15':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Gilles Debunne [Sat, 9 Oct 2010 00:21:42 +0000 (17:21 -0700)]
am
a827d7bc: Merge "Other improvements to text cursor movement." into gingerbread
Merge commit '
a827d7bc347ce6f1a0074dd9fe515919a35a38a9' into gingerbread-plus-aosp
* commit '
a827d7bc347ce6f1a0074dd9fe515919a35a38a9':
Other improvements to text cursor movement.
Mindy Pereira [Sat, 9 Oct 2010 00:14:56 +0000 (17:14 -0700)]
am
13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
Merge commit '
13a81aad3dcc2f0410ffe624e3666a15ee9c82dd' into gingerbread-plus-aosp
* commit '
13a81aad3dcc2f0410ffe624e3666a15ee9c82dd':
DO NOT MERGE Limit the height of the pull glow.
Gilles Debunne [Sat, 9 Oct 2010 00:14:45 +0000 (17:14 -0700)]
Merge "Other improvements to text cursor movement." into gingerbread
Mindy Pereira [Sat, 9 Oct 2010 00:10:21 +0000 (17:10 -0700)]
Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
Scott Main [Fri, 8 Oct 2010 23:43:06 +0000 (16:43 -0700)]
am
3d265b57: am
50f86c65: docs: a few style adjustments to admin doc
Merge commit '
3d265b5775a74b1d5eb726238f13cf63e8465594' into gingerbread-plus-aosp
* commit '
3d265b5775a74b1d5eb726238f13cf63e8465594':
docs: a few style adjustments to admin doc
Scott Main [Fri, 8 Oct 2010 23:39:08 +0000 (16:39 -0700)]
am
50f86c65: docs: a few style adjustments to admin doc
Merge commit '
50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread
* commit '
50f86c65206072be0ca924f03b8d460365199bcd':
docs: a few style adjustments to admin doc
Scott Main [Fri, 8 Oct 2010 23:37:51 +0000 (16:37 -0700)]
am
72552887: am
2e5a22aa: docs: remove old "new" tags from side nav
Merge commit '
7255288755661587958d384338d4808e76959d86' into gingerbread-plus-aosp
* commit '
7255288755661587958d384338d4808e76959d86':
docs: remove old "new" tags from side nav
Scott Main [Fri, 8 Oct 2010 23:30:47 +0000 (16:30 -0700)]
am
2e5a22aa: docs: remove old "new" tags from side nav
Merge commit '
2e5a22aa3cd9ca81c82e93044dca6f36c395746d' into gingerbread
* commit '
2e5a22aa3cd9ca81c82e93044dca6f36c395746d':
docs: remove old "new" tags from side nav
Andreas Huber [Fri, 8 Oct 2010 22:55:44 +0000 (15:55 -0700)]
am
beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread
Merge commit '
beffefa24f398b610d58dd583d9f5613dc529c28' into gingerbread-plus-aosp
* commit '
beffefa24f398b610d58dd583d9f5613dc529c28':
RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
Scott Main [Fri, 8 Oct 2010 22:55:40 +0000 (15:55 -0700)]
am
d7170b2a: am
65e62f4f: docs: new web apps dev guides
Merge commit '
d7170b2a68dc9b9df6de9b063d25ff0ec20c86c4' into gingerbread-plus-aosp
* commit '
d7170b2a68dc9b9df6de9b063d25ff0ec20c86c4':
docs: new web apps dev guides
Brad Fitzpatrick [Fri, 8 Oct 2010 22:51:32 +0000 (15:51 -0700)]
am
a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread
Merge commit '
a4682ed7547e895605d102ab17fc5c134b4ab38f' into gingerbread-plus-aosp
* commit '
a4682ed7547e895605d102ab17fc5c134b4ab38f':
Minor SharedPreference clean-up.
Andreas Huber [Fri, 8 Oct 2010 22:49:48 +0000 (15:49 -0700)]
Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread
Scott Main [Fri, 8 Oct 2010 22:43:44 +0000 (15:43 -0700)]
am
65e62f4f: docs: new web apps dev guides
Merge commit '
65e62f4f908394fc469cf535fef7c16035a428a2' into gingerbread
* commit '
65e62f4f908394fc469cf535fef7c16035a428a2':
docs: new web apps dev guides
Brad Fitzpatrick [Fri, 8 Oct 2010 22:35:45 +0000 (15:35 -0700)]
Merge "Minor SharedPreference clean-up." into gingerbread
Dianne Hackborn [Fri, 8 Oct 2010 22:24:30 +0000 (15:24 -0700)]
am
62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread
Merge commit '
62d8874eb74045b37140857ea3b31f198f0adffa' into gingerbread-plus-aosp
* commit '
62d8874eb74045b37140857ea3b31f198f0adffa':
Fix retaining of granted permissions when updating of system app.
Dianne Hackborn [Fri, 8 Oct 2010 22:21:49 +0000 (15:21 -0700)]
Merge "Fix retaining of granted permissions when updating of system app." into gingerbread
Dianne Hackborn [Fri, 8 Oct 2010 22:12:55 +0000 (15:12 -0700)]
am
db56b9bd: Merge "Maybe fix #
3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread
Merge commit '
db56b9bd39e739474684987b83f386f50596aa5d' into gingerbread-plus-aosp
* commit '
db56b9bd39e739474684987b83f386f50596aa5d':
Maybe fix #
3076572: phone process crashes in SipService, trying to get wifi lock
Dianne Hackborn [Fri, 8 Oct 2010 22:09:23 +0000 (15:09 -0700)]
Merge "Maybe fix #
3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread
Steve Howard [Fri, 8 Oct 2010 21:44:42 +0000 (14:44 -0700)]
am
d8d60da6: Merge "Update DownloadManager API to support bulk actions." into gingerbread
Merge commit '
d8d60da616343b3520b666c385d0005db860be83' into gingerbread-plus-aosp
* commit '
d8d60da616343b3520b666c385d0005db860be83':
Update DownloadManager API to support bulk actions.
Gilles Debunne [Fri, 8 Oct 2010 21:44:38 +0000 (14:44 -0700)]
am
50662f5f: Merge "TextView cursor and selection improvements." into gingerbread
Merge commit '
50662f5f04d69b9ec0335f17cfbf6c035bd86577' into gingerbread-plus-aosp
* commit '
50662f5f04d69b9ec0335f17cfbf6c035bd86577':
TextView cursor and selection improvements.