OSDN Git Service
Jeff Brown [Mon, 14 Jun 2010 03:03:20 +0000 (20:03 -0700)]
Jeff Brown [Mon, 14 Jun 2010 03:01:47 +0000 (20:01 -0700)]
am
5e95930b: am
43a9527c: Fix include paths.
Merge commit '
5e95930bd87b98b01ffe48075fa13c234c2ed08f' into gingerbread-plus-aosp
* commit '
5e95930bd87b98b01ffe48075fa13c234c2ed08f':
Fix include paths.
Jeff Brown [Mon, 14 Jun 2010 02:59:26 +0000 (19:59 -0700)]
am
43a9527c: Fix include paths.
Merge commit '
43a9527c54b71cb17515591af37eeeef6c22e3ff' into gingerbread
* commit '
43a9527c54b71cb17515591af37eeeef6c22e3ff':
Fix include paths.
Jeff Brown [Mon, 14 Jun 2010 02:35:19 +0000 (19:35 -0700)]
Fix include paths.
Change-Id: Ifda45688f9f02710a74d5d7a7d902bacf1441e2e
Jeff Brown [Mon, 14 Jun 2010 02:16:55 +0000 (19:16 -0700)]
resolved conflicts for merge of
9e660c82 to master
Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43
Jeff Brown [Mon, 14 Jun 2010 00:59:04 +0000 (17:59 -0700)]
am
7c8aa44f: am
46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '
7c8aa44f320f45e8417f0aba9ca67af6a67a5cf7' into gingerbread-plus-aosp
* commit '
7c8aa44f320f45e8417f0aba9ca67af6a67a5cf7':
Native input dispatch rewrite work in progress.
Jeff Brown [Mon, 14 Jun 2010 00:55:28 +0000 (17:55 -0700)]
am
46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '
46b9ac0ae2162309774a7478cd9d4e578747bfc2' into gingerbread
* commit '
46b9ac0ae2162309774a7478cd9d4e578747bfc2':
Native input dispatch rewrite work in progress.
Jeff Brown [Fri, 23 Apr 2010 01:58:52 +0000 (18:58 -0700)]
Native input dispatch rewrite work in progress.
The old dispatch mechanism has been left in place and continues to
be used by default for now. To enable native input dispatch,
edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy.
Includes part of the new input event NDK API. Some details TBD.
To wire up input dispatch, as the ViewRoot adds a window to the
window session it receives an InputChannel object as an output
argument. The InputChannel encapsulates the file descriptors for a
shared memory region and two pipe end-points. The ViewRoot then
provides the InputChannel to the InputQueue. Behind the
scenes, InputQueue simply attaches handlers to the native PollLoop object
that underlies the MessageQueue. This way MessageQueue doesn't need
to know anything about input dispatch per-se, it just exposes (in native
code) a PollLoop that other components can use to monitor file descriptor
state changes.
There can be zero or more targets for any given input event. Each
input target is specified by its input channel and some parameters
including flags, an X/Y coordinate offset, and the dispatch timeout.
An input target can request either synchronous dispatch (for foreground apps)
or asynchronous dispatch (fire-and-forget for wallpapers and "outside"
targets). Currently, finding the appropriate input targets for an event
requires a call back into the WindowManagerServer from native code.
In the future this will be refactored to avoid most of these callbacks
except as required to handle pending focus transitions.
End-to-end event dispatch mostly works!
To do: event injection, rate limiting, ANRs, testing, optimization, etc.
Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
Brad Fitzpatrick [Sat, 12 Jun 2010 01:30:09 +0000 (18:30 -0700)]
am
11bd9d1e: am
94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Merge commit '
11bd9d1ec20ce3bbd3791b537faad429a1ca87e7'
* commit '
11bd9d1ec20ce3bbd3791b537faad429a1ca87e7':
More StrictMode work, handling violations in ActivityManagerService.
Brad Fitzpatrick [Sat, 12 Jun 2010 01:28:57 +0000 (18:28 -0700)]
am
94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Merge commit '
94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2' into gingerbread-plus-aosp
* commit '
94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2':
More StrictMode work, handling violations in ActivityManagerService.
Brad Fitzpatrick [Sat, 12 Jun 2010 01:27:20 +0000 (18:27 -0700)]
Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Dirk Dougherty [Sat, 12 Jun 2010 00:00:47 +0000 (17:00 -0700)]
am
c59793e1: am
3a010fa6: am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
c59793e13146d81daec912d1fb91cff9c958e04b'
* commit '
c59793e13146d81daec912d1fb91cff9c958e04b':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:58:34 +0000 (16:58 -0700)]
am
3a010fa6: am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
3a010fa6192f09121fc920810c5a8366b5b09f46' into gingerbread-plus-aosp
* commit '
3a010fa6192f09121fc920810c5a8366b5b09f46':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:56:04 +0000 (16:56 -0700)]
am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b' into gingerbread
* commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:49:14 +0000 (16:49 -0700)]
Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Andreas Huber [Fri, 11 Jun 2010 23:01:34 +0000 (16:01 -0700)]
am
df60830a: am
126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit '
df60830a42580af976b0fc88784d1d32191bd1d7'
* commit '
df60830a42580af976b0fc88784d1d32191bd1d7':
Must hold lock here...
Andreas Huber [Fri, 11 Jun 2010 22:59:30 +0000 (15:59 -0700)]
am
126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit '
126ca6f9ecab6f912ea9f4f00af35c410aae504b' into gingerbread-plus-aosp
* commit '
126ca6f9ecab6f912ea9f4f00af35c410aae504b':
Must hold lock here...
Andreas Huber [Fri, 11 Jun 2010 22:58:19 +0000 (15:58 -0700)]
Merge "Must hold lock here..." into gingerbread
Irfan Sheriff [Fri, 11 Jun 2010 22:32:24 +0000 (15:32 -0700)]
am
a4fb8b3d: am
c2bc66d4: Merge "Dont persist config on failure" into gingerbread
Merge commit '
a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc'
* commit '
a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc':
Dont persist config on failure
Irfan Sheriff [Fri, 11 Jun 2010 22:30:36 +0000 (15:30 -0700)]
am
c2bc66d4: Merge "Dont persist config on failure" into gingerbread
Merge commit '
c2bc66d40510be99e748697cb12c2609cc0e23fc' into gingerbread-plus-aosp
* commit '
c2bc66d40510be99e748697cb12c2609cc0e23fc':
Dont persist config on failure
Irfan Sheriff [Fri, 11 Jun 2010 22:28:24 +0000 (15:28 -0700)]
Merge "Dont persist config on failure" into gingerbread
Mike Lockwood [Fri, 11 Jun 2010 22:14:16 +0000 (15:14 -0700)]
Merge "CameraBrowser: Support for deleting pictures."
Mike Lockwood [Fri, 11 Jun 2010 22:13:38 +0000 (15:13 -0700)]
Merge "MTP: Add host support for deleting objects."
James Dong [Fri, 11 Jun 2010 21:34:09 +0000 (14:34 -0700)]
am
ae2c4774: am
f62c57d6: Merge "Initial checkin for pause and resume control" into kraken
Merge commit '
ae2c47746b5fda636a157c4fdb0365a67d4604c3'
* commit '
ae2c47746b5fda636a157c4fdb0365a67d4604c3':
Initial checkin for pause and resume control
James Dong [Fri, 11 Jun 2010 21:31:49 +0000 (14:31 -0700)]
am
f62c57d6: Merge "Initial checkin for pause and resume control" into kraken
Merge commit '
f62c57d684b83df7d2817db976c0afdb500ae92a' into gingerbread-plus-aosp
* commit '
f62c57d684b83df7d2817db976c0afdb500ae92a':
Initial checkin for pause and resume control
James Dong [Fri, 11 Jun 2010 21:28:55 +0000 (14:28 -0700)]
Merge "Initial checkin for pause and resume control" into kraken
Dianne Hackborn [Fri, 11 Jun 2010 18:00:53 +0000 (11:00 -0700)]
am
4d4f265e: am
9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken
Merge commit '
4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f'
* commit '
4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f':
Adjust activity manager process OOM adj.
Andreas Huber [Fri, 11 Jun 2010 18:00:44 +0000 (11:00 -0700)]
am
0905ba7b: am
f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Merge commit '
0905ba7ba62567c1d1b5b0567827c35d40390b52'
* commit '
0905ba7ba62567c1d1b5b0567827c35d40390b52':
Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Dianne Hackborn [Fri, 11 Jun 2010 17:58:48 +0000 (10:58 -0700)]
am
9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken
Merge commit '
9f8cc518e14c7a34bc52da712afbf02d84585f67' into gingerbread-plus-aosp
* commit '
9f8cc518e14c7a34bc52da712afbf02d84585f67':
Adjust activity manager process OOM adj.
Andreas Huber [Fri, 11 Jun 2010 17:58:44 +0000 (10:58 -0700)]
am
f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Merge commit '
f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9' into gingerbread-plus-aosp
* commit '
f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9':
Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Dianne Hackborn [Fri, 11 Jun 2010 17:53:16 +0000 (10:53 -0700)]
Merge "Adjust activity manager process OOM adj." into kraken
Andreas Huber [Fri, 11 Jun 2010 17:52:00 +0000 (10:52 -0700)]
Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Andreas Huber [Fri, 11 Jun 2010 17:16:39 +0000 (10:16 -0700)]
am
b165719e: am
e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Merge commit '
b165719e93dd390b4f71f5d5e993880529cc841f'
* commit '
b165719e93dd390b4f71f5d5e993880529cc841f':
Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Andreas Huber [Fri, 11 Jun 2010 17:12:59 +0000 (10:12 -0700)]
am
e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Merge commit '
e577e87a2d80890190f14edc4a5caf70d7c566bf' into gingerbread-plus-aosp
* commit '
e577e87a2d80890190f14edc4a5caf70d7c566bf':
Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Vasu Nori [Fri, 11 Jun 2010 16:55:41 +0000 (09:55 -0700)]
Merge "sqlite error "unsupported file format" = corruption"
Chih-Chung Chang [Fri, 11 Jun 2010 10:39:17 +0000 (03:39 -0700)]
am
dac5e001: am
b8bb78f5: Change camera interface to support multiple cameras.
Merge commit '
dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9'
* commit '
dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9':
Change camera interface to support multiple cameras.
Chih-Chung Chang [Fri, 11 Jun 2010 10:27:30 +0000 (03:27 -0700)]
am
b8bb78f5: Change camera interface to support multiple cameras.
Merge commit '
b8bb78f54b48868465a9d69d65fda08524ab5ae1' into gingerbread-plus-aosp
* commit '
b8bb78f54b48868465a9d69d65fda08524ab5ae1':
Change camera interface to support multiple cameras.
Chih-Chung Chang [Thu, 10 Jun 2010 05:32:16 +0000 (13:32 +0800)]
Change camera interface to support multiple cameras.
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
Wu-cheng Li [Fri, 11 Jun 2010 07:35:06 +0000 (00:35 -0700)]
am
e5dd62e8: am
2fd73a45: Unhide camera metering mode API.
Merge commit '
e5dd62e873448fd8c1fd8e80739b58bda649a6e7'
* commit '
e5dd62e873448fd8c1fd8e80739b58bda649a6e7':
Unhide camera metering mode API.
Wu-cheng Li [Fri, 11 Jun 2010 07:33:37 +0000 (00:33 -0700)]
am
2fd73a45: Unhide camera metering mode API.
Merge commit '
2fd73a452268d2acb6e72a1d23a422085ed3c510' into gingerbread-plus-aosp
* commit '
2fd73a452268d2acb6e72a1d23a422085ed3c510':
Unhide camera metering mode API.
Irfan Sheriff [Fri, 11 Jun 2010 02:04:25 +0000 (19:04 -0700)]
am
749defb0: am
f4f614f5: am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Irfan Sheriff [Fri, 11 Jun 2010 02:02:23 +0000 (19:02 -0700)]
am
f4f614f5: am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Irfan Sheriff [Fri, 11 Jun 2010 01:59:42 +0000 (18:59 -0700)]
am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken
* commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
Irfan Sheriff [Fri, 11 Jun 2010 01:56:04 +0000 (18:56 -0700)]
Merge "Remove indefinite DHCP retries" into froyo
Romain Guy [Fri, 11 Jun 2010 01:52:47 +0000 (18:52 -0700)]
Merge "Refactor HardwareRenderer to allow the use of OpenGL ES 2.0."
Vasu Nori [Fri, 11 Jun 2010 00:52:24 +0000 (17:52 -0700)]
Merge "NPE in database corruption handler if attached database list is null"
Mathias Agopian [Fri, 11 Jun 2010 00:17:19 +0000 (17:17 -0700)]
am
5b669581: am
9d8e8dcc: Merge "fix [
2757903] Crash in EGL when creating an EGLSurface" into kraken
Mathias Agopian [Fri, 11 Jun 2010 00:15:12 +0000 (17:15 -0700)]
am
9d8e8dcc: Merge "fix [
2757903] Crash in EGL when creating an EGLSurface" into kraken
Mathias Agopian [Fri, 11 Jun 2010 00:12:42 +0000 (17:12 -0700)]
Merge "fix [
2757903] Crash in EGL when creating an EGLSurface" into kraken
Dmitri Plotnikov [Thu, 10 Jun 2010 23:52:53 +0000 (16:52 -0700)]
Merge "Reimplement the PhoneNumberFormattingTextWatcher"
Romain Guy [Thu, 10 Jun 2010 23:19:51 +0000 (16:19 -0700)]
Merge "Fix native crash when enabling hardware acceleration."
Mike Lockwood [Thu, 10 Jun 2010 23:13:50 +0000 (16:13 -0700)]
am
799f0e50: am
4001120e: am
f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
Andreas Huber [Thu, 10 Jun 2010 23:13:37 +0000 (16:13 -0700)]
am
627a0019: am
4d61f602: Switch stagefright\'s approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
Andreas Huber [Thu, 10 Jun 2010 23:13:29 +0000 (16:13 -0700)]
am
32d8b25f: am
a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken
Andreas Huber [Thu, 10 Jun 2010 23:13:24 +0000 (16:13 -0700)]
am
566e64af: am
fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
Andreas Huber [Thu, 10 Jun 2010 23:13:18 +0000 (16:13 -0700)]
am
b9d7b46b: am
8f864513: Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string\'s original contents." into kraken
Andreas Huber [Thu, 10 Jun 2010 23:13:11 +0000 (16:13 -0700)]
am
960a0ff1: am
c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
Brad Fitzpatrick [Thu, 10 Jun 2010 22:58:22 +0000 (15:58 -0700)]
resolved conflicts for merge of
f37cbe6b to master
Change-Id: I529b17e55b9668f900f685f92e9831e14a82db05
Mike Lockwood [Thu, 10 Jun 2010 22:32:51 +0000 (15:32 -0700)]
am
4001120e: am
f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
Mike Lockwood [Thu, 10 Jun 2010 22:30:41 +0000 (15:30 -0700)]
am
f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
Merge commit '
f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into kraken
* commit '
f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
Don't adjust lights if screen or button brightness is changed when the screen is off.
Mike Lockwood [Thu, 10 Jun 2010 22:28:31 +0000 (15:28 -0700)]
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
Andreas Huber [Thu, 10 Jun 2010 22:19:29 +0000 (15:19 -0700)]
am
4d61f602: Switch stagefright\'s approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
Andreas Huber [Thu, 10 Jun 2010 22:17:40 +0000 (15:17 -0700)]
am
a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:17:35 +0000 (15:17 -0700)]
am
fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:17:30 +0000 (15:17 -0700)]
am
8f864513: Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string\'s original contents." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:17:24 +0000 (15:17 -0700)]
am
c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:15:50 +0000 (15:15 -0700)]
Merge "Simplify the code in the stagefright commandline utility." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:15:43 +0000 (15:15 -0700)]
Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:15:37 +0000 (15:15 -0700)]
Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:15:29 +0000 (15:15 -0700)]
Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
Brad Fitzpatrick [Thu, 10 Jun 2010 22:03:26 +0000 (15:03 -0700)]
am
438d0595: Introduce "StrictMode"
Kenny Root [Thu, 10 Jun 2010 21:25:39 +0000 (14:25 -0700)]
Merge "Move shaping to native."
Mike Lockwood [Thu, 10 Jun 2010 21:21:53 +0000 (14:21 -0700)]
Merge changes I99b3452f,Idda56860
* changes:
CameraBrowser: Display thumbnails for camera images.
MTP: Add support for retrieving thumbnails to MTP content provider.
Adam Powell [Thu, 10 Jun 2010 21:19:26 +0000 (14:19 -0700)]
am
45c3f843: am
8f1bfb00: am
8f2ca788: Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Adam Powell [Thu, 10 Jun 2010 21:16:32 +0000 (14:16 -0700)]
am
8f1bfb00: am
8f2ca788: Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Adam Powell [Thu, 10 Jun 2010 21:13:51 +0000 (14:13 -0700)]
am
8f2ca788: Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Merge commit '
8f2ca788f369892370477212cf9e7a67721a8c16' into kraken
* commit '
8f2ca788f369892370477212cf9e7a67721a8c16':
Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down.
Adam Powell [Thu, 10 Jun 2010 21:09:50 +0000 (14:09 -0700)]
Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Andreas Huber [Thu, 10 Jun 2010 19:43:53 +0000 (12:43 -0700)]
am
c90e35c1: am
8d300280: Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
Andreas Huber [Thu, 10 Jun 2010 19:43:48 +0000 (12:43 -0700)]
am
3ee447e4: am
75c1c8e3: Merge "Initial check in of a new http data source implementation." into kraken
Andreas Huber [Thu, 10 Jun 2010 19:42:10 +0000 (12:42 -0700)]
am
8d300280: Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
Andreas Huber [Thu, 10 Jun 2010 19:42:06 +0000 (12:42 -0700)]
am
75c1c8e3: Merge "Initial check in of a new http data source implementation." into kraken
Andreas Huber [Thu, 10 Jun 2010 19:41:05 +0000 (12:41 -0700)]
Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
Andreas Huber [Thu, 10 Jun 2010 19:40:39 +0000 (12:40 -0700)]
Merge "Initial check in of a new http data source implementation." into kraken
Nick Kralevich [Thu, 10 Jun 2010 18:58:59 +0000 (11:58 -0700)]
am
fc66fa53: (-s ours) am
9a9724c3: am
a2c6d5bf: (-s ours) do not merge: cherry-picked
929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Nick Kralevich [Thu, 10 Jun 2010 18:57:05 +0000 (11:57 -0700)]
am
9a9724c3: am
a2c6d5bf: (-s ours) do not merge: cherry-picked
929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Nick Kralevich [Thu, 10 Jun 2010 18:54:53 +0000 (11:54 -0700)]
Andreas Huber [Thu, 10 Jun 2010 18:14:26 +0000 (11:14 -0700)]
Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents.
Change-Id: I6961f3cf10ba3b728579ea63262db750a4cf8577
Irfan Sheriff [Thu, 10 Jun 2010 18:05:25 +0000 (11:05 -0700)]
Merge "Make NetworkStateTracker an interface"
James Dong [Thu, 10 Jun 2010 17:18:52 +0000 (10:18 -0700)]
am
3aede37f: am
3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken
Andreas Huber [Thu, 10 Jun 2010 17:17:04 +0000 (10:17 -0700)]
am
7b909c05: am
66b89a62: Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
James Dong [Thu, 10 Jun 2010 17:16:55 +0000 (10:16 -0700)]
am
3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken
Andreas Huber [Thu, 10 Jun 2010 17:14:50 +0000 (10:14 -0700)]
am
66b89a62: Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
James Dong [Thu, 10 Jun 2010 17:14:38 +0000 (10:14 -0700)]
Merge "Remove the lock/unlock workaround from CameraService" into kraken
Andreas Huber [Thu, 10 Jun 2010 17:12:57 +0000 (10:12 -0700)]
Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
Kenny Root [Thu, 10 Jun 2010 05:35:55 +0000 (22:35 -0700)]
am
c46f03e4: am
36921ad8: am
b00854d4: Import revised translations
Kenny Root [Thu, 10 Jun 2010 05:33:47 +0000 (22:33 -0700)]
am
36921ad8: am
b00854d4: Import revised translations
Kenny Root [Thu, 10 Jun 2010 05:31:32 +0000 (22:31 -0700)]
am
b00854d4: Import revised translations
Merge commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e' into kraken
* commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e':
Import revised translations
James Dong [Wed, 9 Jun 2010 22:57:48 +0000 (15:57 -0700)]
Remove the lock/unlock workaround from CameraService
bug -
2677772
Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
Dmitri Plotnikov [Thu, 10 Jun 2010 03:22:03 +0000 (20:22 -0700)]
Merge "Adding a stopLoading() method."
Mathias Agopian [Thu, 10 Jun 2010 02:57:01 +0000 (19:57 -0700)]
am
e52d66fa: am
44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken