Commit Graph

17098 Commits

Author SHA1 Message Date
Jeff Brown
04c1a8cdec resolved conflicts for merge of 9e660c82 to master
Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43
2010-06-13 19:16:55 -07:00
Jeff Brown
9dbc30d449 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.
2010-06-13 17:59:04 -07:00
Jeff Brown
39a128a857 am 46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '46b9ac0ae2162309774a7478cd9d4e578747bfc2' into gingerbread

* commit '46b9ac0ae2162309774a7478cd9d4e578747bfc2':
  Native input dispatch rewrite work in progress.
2010-06-13 17:55:28 -07:00
Jeff Brown
e839a589bf 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
2010-06-13 17:42:16 -07:00
Brad Fitzpatrick
34949805bc 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.
2010-06-11 18:30:09 -07:00
Brad Fitzpatrick
3dd4817f0e 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.
2010-06-11 18:28:57 -07:00
Brad Fitzpatrick
1b02178d16 Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread 2010-06-11 18:27:20 -07:00
Dirk Dougherty
7918c38542 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.
2010-06-11 17:00:47 -07:00
Dirk Dougherty
6c424e2fb1 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.
2010-06-11 16:58:34 -07:00
Dirk Dougherty
d5fd97c70b 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.
2010-06-11 16:56:04 -07:00
Dirk Dougherty
6c622422b6 Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo 2010-06-11 16:49:14 -07:00
Andreas Huber
db75598899 am df60830a: am 126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7'

* commit 'df60830a42580af976b0fc88784d1d32191bd1d7':
  Must hold lock here...
2010-06-11 16:01:34 -07:00
Andreas Huber
13387dbf95 am 126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b' into gingerbread-plus-aosp

* commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b':
  Must hold lock here...
2010-06-11 15:59:30 -07:00
Andreas Huber
7cff0854f4 Merge "Must hold lock here..." into gingerbread 2010-06-11 15:58:19 -07:00
Irfan Sheriff
9c1d61add4 am a4fb8b3d: am c2bc66d4: Merge "Dont persist config on failure" into gingerbread
Merge commit 'a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc'

* commit 'a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc':
  Dont persist config on failure
2010-06-11 15:32:24 -07:00
Irfan Sheriff
829c16e388 am c2bc66d4: Merge "Dont persist config on failure" into gingerbread
Merge commit 'c2bc66d40510be99e748697cb12c2609cc0e23fc' into gingerbread-plus-aosp

* commit 'c2bc66d40510be99e748697cb12c2609cc0e23fc':
  Dont persist config on failure
2010-06-11 15:30:36 -07:00
Irfan Sheriff
a62ea287da Merge "Dont persist config on failure" into gingerbread 2010-06-11 15:28:24 -07:00
Mike Lockwood
ded9f2ab95 Merge "CameraBrowser: Support for deleting pictures." 2010-06-11 15:14:16 -07:00
Mike Lockwood
50422d8ebd Merge "MTP: Add host support for deleting objects." 2010-06-11 15:13:38 -07:00
James Dong
6dd4cd53c1 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
2010-06-11 14:34:09 -07:00
James Dong
9090e5fd60 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
2010-06-11 14:31:49 -07:00
James Dong
f7b5648c22 Merge "Initial checkin for pause and resume control" into kraken 2010-06-11 14:28:55 -07:00
Dianne Hackborn
22b81d7c69 am 4d4f265e: am 9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken
Merge commit '4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f'

* commit '4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f':
  Adjust activity manager process OOM adj.
2010-06-11 11:00:53 -07:00
Andreas Huber
8463e2d045 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.
2010-06-11 11:00:44 -07:00
Dianne Hackborn
9921af3de8 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.
2010-06-11 10:58:48 -07:00
Andreas Huber
7d867210ee 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.
2010-06-11 10:58:44 -07:00
Dianne Hackborn
9717ce1e9a Merge "Adjust activity manager process OOM adj." into kraken 2010-06-11 10:53:16 -07:00
Andreas Huber
9812b9ce77 Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken 2010-06-11 10:52:00 -07:00
Andreas Huber
803657e2e9 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.
2010-06-11 10:16:39 -07:00
Andreas Huber
0ca952c7ab 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.
2010-06-11 10:12:59 -07:00
Vasu Nori
4e0245ce2a Merge "sqlite error "unsupported file format" = corruption" 2010-06-11 09:55:41 -07:00
Chih-Chung Chang
917ed7b41b am dac5e001: am b8bb78f5: Change camera interface to support multiple cameras.
Merge commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9'

* commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9':
  Change camera interface to support multiple cameras.
2010-06-11 03:39:17 -07:00
Chih-Chung Chang
9f2fcfae26 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.
2010-06-11 03:27:30 -07:00
Chih-Chung Chang
189aab1390 Change camera interface to support multiple cameras.
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
2010-06-11 16:47:33 +08:00
Wu-cheng Li
9b048d8a72 am e5dd62e8: am 2fd73a45: Unhide camera metering mode API.
Merge commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7'

* commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7':
  Unhide camera metering mode API.
2010-06-11 00:35:06 -07:00
Wu-cheng Li
271fd4ff86 am 2fd73a45: Unhide camera metering mode API.
Merge commit '2fd73a452268d2acb6e72a1d23a422085ed3c510' into gingerbread-plus-aosp

* commit '2fd73a452268d2acb6e72a1d23a422085ed3c510':
  Unhide camera metering mode API.
2010-06-11 00:33:37 -07:00
Irfan Sheriff
78ac1aced9 am 749defb0: am f4f614f5: am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 19:04:25 -07:00
Irfan Sheriff
ec49dd6dab am f4f614f5: am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 19:02:23 -07:00
Irfan Sheriff
deaae079f4 am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken

* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
  Remove indefinite DHCP retries
2010-06-10 18:59:42 -07:00
Irfan Sheriff
c17564db5a Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 18:56:04 -07:00
Romain Guy
b59c1126d8 Merge "Refactor HardwareRenderer to allow the use of OpenGL ES 2.0." 2010-06-10 18:52:47 -07:00
Vasu Nori
4410a02414 Merge "NPE in database corruption handler if attached database list is null" 2010-06-10 17:52:24 -07:00
Mathias Agopian
f0754de2b0 am 5b669581: am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:17:19 -07:00
Mathias Agopian
434216dbcf am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:15:12 -07:00
Mathias Agopian
5f86a2d33c Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:12:42 -07:00
Dmitri Plotnikov
effc9c3ee0 Merge "Reimplement the PhoneNumberFormattingTextWatcher" 2010-06-10 16:52:53 -07:00
Romain Guy
9e40cb4ee4 Merge "Fix native crash when enabling hardware acceleration." 2010-06-10 16:19:51 -07:00
Mike Lockwood
561b4de1e7 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 2010-06-10 16:13:50 -07:00
Andreas Huber
73556c3fab 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. 2010-06-10 16:13:37 -07:00
Andreas Huber
5c7403fb1b am 32d8b25f: am a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken 2010-06-10 16:13:29 -07:00