Commit Graph

52592 Commits

Author SHA1 Message Date
Michael Wright
9897516aba am f27e6681: Merge "Add new MotionEvent actions for button press and release." into mnc-dev
* commit 'f27e6681048f3ee7a589ab824a1041667ff838e0':
  Add new MotionEvent actions for button press and release.
2015-05-14 19:28:10 +00:00
Dan Stoza
7472fa996a am 81103f12: am 553cbb25: Merge "SurfaceFlinger: Handle EGL errors more cleanly"
* commit '81103f128d651d705c90b3ab9fe55bff674320ef':
  SurfaceFlinger: Handle EGL errors more cleanly
2015-05-14 18:19:03 +00:00
Dan Stoza
81103f128d am 553cbb25: Merge "SurfaceFlinger: Handle EGL errors more cleanly"
* commit '553cbb254478e7875aa3e4a95838b1811095e328':
  SurfaceFlinger: Handle EGL errors more cleanly
2015-05-14 18:06:55 +00:00
Dan Stoza
553cbb2544 Merge "SurfaceFlinger: Handle EGL errors more cleanly" 2015-05-14 17:56:27 +00:00
Dan Stoza
59bfd2bbed SurfaceFlinger: Handle EGL errors more cleanly
Adds some more safety checking for cases where we get an error while
trying to create the EGLImage. The checking puts the Layer into a
failed state after detecting an error, since the shadow queue may no
longer be synchronized.

Bug: 20957332
Change-Id: I68b4c40eab3e58731b875ed5752f2c7d17f14bcb
(cherry picked from commit 65476f3332)
2015-05-14 10:43:07 -07:00
Michael Wright
f27e668104 Merge "Add new MotionEvent actions for button press and release." into mnc-dev 2015-05-14 13:31:25 +00:00
Michael Wright
48a8a0e432 Add new MotionEvent actions for button press and release.
Introduce ACTION_BUTTON_PRESS and ACTION_BUTTON_RELEASE as actions to
signal a button press or release. If these actions happen
simulanteously with a DOWN or UP event then they're explicitly
ordered to happen after the DOWN or preceding the UP in order to send
them to the most recently targeted view.

Also, introduce new stylus button constants that differ from the
constants we use for mouse buttons.

Bug: 20704355
Change-Id: Ib960a5004db5429ad2fc8db020704773e2978327
2015-05-14 13:25:41 +01:00
Hiroshi Yamauchi
0f6e43f874 am d94d0d00: am 9188b4bb: Merge "Replace JNI primitive array critical calls with non-critical ones."
* commit 'd94d0d001723d66f7cc56afa97cb1f9e270a3520':
  Replace JNI primitive array critical calls with non-critical ones.
2015-05-13 23:38:07 +00:00
Hiroshi Yamauchi
d94d0d0017 am 9188b4bb: Merge "Replace JNI primitive array critical calls with non-critical ones."
* commit '9188b4bb5d44c219face5a4c1c681700cc838294':
  Replace JNI primitive array critical calls with non-critical ones.
2015-05-13 22:59:45 +00:00
Hiroshi Yamauchi
9188b4bb5d Merge "Replace JNI primitive array critical calls with non-critical ones." 2015-05-13 22:47:42 +00:00
Dmitriy Ivanov
a1892ac522 am af3a3778: Merge "Switch libGLESv1_CM/libGLESv2 to hash-style=both" into mnc-dev
* commit 'af3a3778c2c17a8064da599bcabb7d141f59f9af':
  Switch libGLESv1_CM/libGLESv2 to hash-style=both
2015-05-13 22:34:48 +00:00
Dmitriy Ivanov
af3a3778c2 Merge "Switch libGLESv1_CM/libGLESv2 to hash-style=both" into mnc-dev 2015-05-13 22:11:19 +00:00
Dmitriy Ivanov
ae62e0573a Switch libGLESv1_CM/libGLESv2 to hash-style=both
Old version of unity uses custom linker to link
  itself and libmono. The custom linker does not
  support lookups with gnu-hash style. Switching
  libraries needed by libunity.so to --hash-style=both
  fixes this problem.

Bug: http://b/20093774
Change-Id: I2a4887cf7a5ee80a8976ecaad54b52dc62518e55
2015-05-13 15:05:07 -07:00
Hiroshi Yamauchi
569bc1bcdd Replace JNI primitive array critical calls with non-critical ones.
The glgen part.

(cherry pick commit 4e7de461c1)

Bug: 19235243
Change-Id: I0d1e78acf39feb37a67e857216a6d52f4cede180
2015-05-13 13:11:30 -07:00
Hiroshi Yamauchi
284403ba1d am 6f48c7f3: Merge "Replace JNI primitive array critical calls with non-critical ones." into mnc-dev
* commit '6f48c7f3dc1cb71d0345b329b34ae62eb5bfa557':
  Replace JNI primitive array critical calls with non-critical ones.
2015-05-13 19:05:32 +00:00
Hiroshi Yamauchi
6f48c7f3dc Merge "Replace JNI primitive array critical calls with non-critical ones." into mnc-dev 2015-05-13 18:37:57 +00:00
Dan Stoza
6d7e387cf2 am ac8611db: am f984bad9: Merge "Fix PTS handling for buffer replacement"
* commit 'ac8611db6a9b42cd6b185a877c2f5d4e470e2e89':
  Fix PTS handling for buffer replacement
2015-05-13 18:19:38 +00:00
Dan Stoza
0160cbcd7a am a1f8b324: am bbb010b7: Merge "binder: add uint64 support to Parcel."
* commit 'a1f8b3249549b4b38c087e8843167854250503b3':
  binder: add uint64 support to Parcel.
2015-05-13 18:19:37 +00:00
Dan Stoza
ac8611db6a am f984bad9: Merge "Fix PTS handling for buffer replacement"
* commit 'f984bad94aa98f49a3959f3119114e94a547b9bf':
  Fix PTS handling for buffer replacement
2015-05-13 18:04:10 +00:00
Dan Stoza
a1f8b32495 am bbb010b7: Merge "binder: add uint64 support to Parcel."
* commit 'bbb010b79cf824611cc6dfc5984333ac8f2177bd':
  binder: add uint64 support to Parcel.
2015-05-13 18:04:08 +00:00
Dan Stoza
f984bad94a Merge "Fix PTS handling for buffer replacement" 2015-05-13 17:53:22 +00:00
Dan Stoza
bbb010b79c Merge "binder: add uint64 support to Parcel." 2015-05-13 17:52:46 +00:00
Michael Wright
9e40093346 am 4866f087: Merge "Use previous pressure value if the current fusion data is zero." into mnc-dev
* commit '4866f087181af02e870b2d2fc1d4be8d38c2f36e':
  Use previous pressure value if the current fusion data is zero.
2015-05-13 17:15:46 +00:00
Michael Wright
eab5a1ed7c am 4eed0f8f: Merge "Synthesize events for pressure and button changes." into mnc-dev
* commit '4eed0f8f8dd3673e55a93c0b62b8b9ebefa135cf':
  Synthesize events for pressure and button changes.
2015-05-13 17:15:46 +00:00
Dan Stoza
119a03c5a2 am 09d561db: Merge "Fix PTS handling for buffer replacement" into mnc-dev
* commit '09d561dbee9a28db9632ff3d51f633c18aefe023':
  Fix PTS handling for buffer replacement
2015-05-13 17:15:45 +00:00
Michael Wright
4866f08718 Merge "Use previous pressure value if the current fusion data is zero." into mnc-dev 2015-05-13 16:56:07 +00:00
Michael Wright
4eed0f8f8d Merge "Synthesize events for pressure and button changes." into mnc-dev 2015-05-13 16:55:48 +00:00
Dan Stoza
e64a79cd85 Fix PTS handling for buffer replacement
This changes the way that SurfaceFlinger's shadow buffer management
works such that instead of tracking the size of the shadow queue in the
BufferQueue, SF tracks the last frame number it has seen, and passes
that into the acquireBuffer call. BufferQueueConsumer then ensures that
it never returns a buffer newer than that frame number, even if that
means that it must return PRESENT_LATER for an otherwise valid buffer.

Change-Id: I3fcb45f683ed660c3f18a8b85ae1f8a962ba6f0e
(cherry picked from commit a4650a50a0)
2015-05-13 09:43:35 -07:00
Ronghua Wu
f183395296 binder: add uint64 support to Parcel.
Bug: 19620911
Change-Id: Ifce5319e4e35afd344dead67ab7ba1cd399476a3
(cherry picked from commit 2d13afdfa1)
2015-05-13 09:43:35 -07:00
Dan Stoza
09d561dbee Merge "Fix PTS handling for buffer replacement" into mnc-dev 2015-05-13 16:34:07 +00:00
Dan Stoza
c53bc80b62 am 9f5f6ab0: am bfe211f0: Merge "libgui: Always allow allocation on connect"
* commit '9f5f6ab0a2b9b1f16040942c21fe9dda6cc079bf':
  libgui: Always allow allocation on connect
2015-05-13 16:32:06 +00:00
Kenny Root
a43a0d76a4 resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp
Change-Id: Ibb4a2058e585218bdeaf4c1d568093fbbd8f6478
2015-05-13 09:10:17 -07:00
Dan Stoza
cfc3534244 am 2089a65c: am 38d7f755: Merge "libgui: Hook up onFrameReplaced"
* commit '2089a65c9b6b3bb6fc67fe6911c57a30f47e2044':
  libgui: Hook up onFrameReplaced
2015-05-13 15:22:05 +00:00
Adam Lesinski
44382c1367 am 4b4820db: Merge "Verify that the native handle was created" into mnc-dev
* commit '4b4820db4b83875ec5bbae11e468f36f21e5334c':
  Verify that the native handle was created
2015-05-13 03:59:06 +00:00
Adam Lesinski
4b4820db4b Merge "Verify that the native handle was created" into mnc-dev 2015-05-13 03:38:36 +00:00
Adam Lesinski
eaac99a717 Verify that the native handle was created
The inputs to native_handle_create can cause an overflowed allocation,
so check the return value of native_handle_create before accessing
the memory it returns.

Bug:19334482
Change-Id: I1f489382776c2a1390793a79dc27ea17baa9b2a2
2015-05-12 17:35:48 -07:00
Dan Stoza
9f5f6ab0a2 am bfe211f0: Merge "libgui: Always allow allocation on connect"
* commit 'bfe211f00a2b9032ddf04f549db0c9b82666b3be':
  libgui: Always allow allocation on connect
2015-05-12 22:40:47 +00:00
Dan Stoza
bfe211f00a Merge "libgui: Always allow allocation on connect" 2015-05-12 22:33:39 +00:00
Dan Stoza
f0fdde89ee am 48cb8310: Merge "libgui: Always allow allocation on connect" into mnc-dev
* commit '48cb8310e267d177856ad9b2af7b9949d7d62424':
  libgui: Always allow allocation on connect
2015-05-12 22:22:18 +00:00
Johan Euphrosine
91e485fad1 am b9009863: Merge "frameworks/native: document native types and enums"
* commit 'b9009863cb45acd7455c0ac873fb8e6a3e7a4f99':
  frameworks/native: document native types and enums
2015-05-12 22:15:51 +00:00
Johan Euphrosine
b9009863cb Merge "frameworks/native: document native types and enums" 2015-05-12 22:05:22 +00:00
Dan Stoza
cbe5459a99 libgui: Always allow allocation on connect
This change places BufferQueue into a predictable state where
allocation is allowed whenever a producer connects. This allows clients
to disconnect and reconnect without having to worry about being locked
out of allocation.

Bug: 20554276
Change-Id: Ic0f920a3d4204f2cafdfa69e46f3bb4204571d7e
(cherry picked from commit 2b83cc920a)
2015-05-12 15:03:52 -07:00
Dan Stoza
48cb8310e2 Merge "libgui: Always allow allocation on connect" into mnc-dev 2015-05-12 21:57:28 +00:00
Dan Stoza
2b83cc920a libgui: Always allow allocation on connect
This change places BufferQueue into a predictable state where
allocation is allowed whenever a producer connects. This allows clients
to disconnect and reconnect without having to worry about being locked
out of allocation.

Bug: 20554276
Change-Id: Ic0f920a3d4204f2cafdfa69e46f3bb4204571d7e
2015-05-12 14:55:15 -07:00
Johan Euphrosine
bf6d5e012c frameworks/native: document native types and enums
Change-Id: Id94b610f27b87426abb30e13484cbd16990aa995
2015-05-12 14:39:28 -07:00
Hiroshi Yamauchi
4e7de461c1 Replace JNI primitive array critical calls with non-critical ones.
The glgen part.

Bug: 19235243
Change-Id: I69dfa84f15366808b964517c1ba270ddeb3c5940
2015-05-12 14:24:23 -07:00
Dan Stoza
a4650a50a0 Fix PTS handling for buffer replacement
This changes the way that SurfaceFlinger's shadow buffer management
works such that instead of tracking the size of the shadow queue in the
BufferQueue, SF tracks the last frame number it has seen, and passes
that into the acquireBuffer call. BufferQueueConsumer then ensures that
it never returns a buffer newer than that frame number, even if that
means that it must return PRESENT_LATER for an otherwise valid buffer.

Change-Id: I3fcb45f683ed660c3f18a8b85ae1f8a962ba6f0e
2015-05-12 13:10:17 -07:00
Aravind Akella
d0e95fed02 am af8ed3f0: Merge "Improve logging in SensorService dump output." into mnc-dev
* commit 'af8ed3f06cf5a0fd37357b438da803f53f33fa56':
  Improve logging in SensorService dump output.
2015-05-12 19:30:30 +00:00
Aravind Akella
af8ed3f06c Merge "Improve logging in SensorService dump output." into mnc-dev 2015-05-12 19:12:43 +00:00
Aravind Akella
444f267572 Improve logging in SensorService dump output.
Maintain a per sensor circular buffer of last 10 sensor_events and the wall clock time
at which each event is received.

Change-Id: Ia50c825ab5a7aaf0932ce7dce7ac8b9be7071e77
2015-05-12 11:44:01 -07:00