OSDN Git Service
Johan Euphrosine [Wed, 27 May 2015 23:14:38 +0000 (23:14 +0000)]
am
e35e6080: am
738fc3a7: Merge "framework/native/docs: remove doc footer for jd output"
* commit '
e35e60801560a757deb708e6ca47b962202dcc0b':
framework/native/docs: remove doc footer for jd output
Johan Euphrosine [Wed, 27 May 2015 21:41:20 +0000 (21:41 +0000)]
am
738fc3a7: Merge "framework/native/docs: remove doc footer for jd output"
* commit '
738fc3a722cc2c753b591298e70b0f86c481bba2':
framework/native/docs: remove doc footer for jd output
Johan Euphrosine [Wed, 27 May 2015 21:30:37 +0000 (21:30 +0000)]
Merge "framework/native/docs: remove doc footer for jd output"
Michael Lentine [Wed, 27 May 2015 20:24:54 +0000 (20:24 +0000)]
am
7fc3ef0e: Merge "Add hotplug support for primary display." into mnc-dev
* commit '
7fc3ef0eb0077eedaa09a7b505b6ec067e814170':
Add hotplug support for primary display.
Dan Stoza [Wed, 27 May 2015 17:42:35 +0000 (17:42 +0000)]
am
0e65e6c2: libgui: Fix surface damage on rotated buffers
* commit '
0e65e6c283c96d514c5ecefbb46a976939cfa64a':
libgui: Fix surface damage on rotated buffers
Michael Lentine [Wed, 27 May 2015 17:39:55 +0000 (17:39 +0000)]
Merge "Add hotplug support for primary display." into mnc-dev
Johan Euphrosine [Wed, 27 May 2015 17:13:35 +0000 (10:13 -0700)]
framework/native/docs: remove doc footer for jd output
Change-Id: Ib65a436f4846eb5c02e42c6f1cbda5eab58c68ab
Dan Stoza [Tue, 26 May 2015 20:22:27 +0000 (13:22 -0700)]
libgui: Fix surface damage on rotated buffers
Flips the width and height when the buffer comes in with a 90 degree
rotation so that performing the Y-flip from GL works correctly.
Bug:
20761426
Change-Id: I41c9edc8549c6cbdb534277b996ff20c59034582
Johan Euphrosine [Fri, 22 May 2015 22:51:42 +0000 (22:51 +0000)]
am
f9c83b8f: am
116e7aeb: Merge "frameworks/native/docs: add doxygen configuration"
* commit '
f9c83b8f889cb3409d60bdfce71d8c6a8ad39941':
frameworks/native/docs: add doxygen configuration
Johan Euphrosine [Fri, 22 May 2015 22:37:05 +0000 (22:37 +0000)]
am
116e7aeb: Merge "frameworks/native/docs: add doxygen configuration"
* commit '
116e7aebb68bb0394eb12092db8282981012784e':
frameworks/native/docs: add doxygen configuration
Johan Euphrosine [Fri, 22 May 2015 22:28:24 +0000 (22:28 +0000)]
Merge "frameworks/native/docs: add doxygen configuration"
Michael Lentine [Fri, 22 May 2015 22:09:01 +0000 (22:09 +0000)]
am
20828e63: Merge "Fix surfaceflinger tests." into mnc-dev
* commit '
20828e633dd929b87c0297dadcdebb867f2b41d4':
Fix surfaceflinger tests.
Michael Lentine [Fri, 22 May 2015 22:09:00 +0000 (22:09 +0000)]
am
01f9e920: Merge "Fix libgui tests." into mnc-dev
* commit '
01f9e920b093c6414b32434cdd6efda7fe578ca5':
Fix libgui tests.
Michael Lentine [Fri, 22 May 2015 20:16:10 +0000 (20:16 +0000)]
Merge "Fix surfaceflinger tests." into mnc-dev
Michael Lentine [Fri, 22 May 2015 20:16:01 +0000 (20:16 +0000)]
Merge "Fix libgui tests." into mnc-dev
Michael Lentine [Wed, 13 May 2015 01:04:26 +0000 (18:04 -0700)]
Add hotplug support for primary display.
When the primary is connected/disconnected on tv devices HWComposer updates
it's display parameters but doesn't destroy or recreate the display.
Bug:
18698244
Change-Id: I759c8f75d3e3a7462b85eb51973fb5072b71a702
Michael Lentine [Thu, 21 May 2015 20:48:24 +0000 (13:48 -0700)]
Fix surfaceflinger tests.
Update the screenshot code and add correct return values to surface flinger's
capturescreenshot function.
Buf:
18138368
Change-Id: Ieb42d289088589f941502fbd69da7aa939265e07
Michael Lentine [Tue, 19 May 2015 22:23:43 +0000 (15:23 -0700)]
Fix libgui tests.
Update IGraphicsBufferProducerTest to the new maximum enum value which is now
NATIVE_WINDOW_BUFFER_AGE. Update SurfaceTextureGLToGL_test to use the correct
counts for GraphicsBuffer refs.
Buf:
18138368
Change-Id: Ie2f7e00b414d63100b16944e3ab36b1ffceecd57
Chong Zhang [Fri, 22 May 2015 19:28:01 +0000 (19:28 +0000)]
am
041b945e: Merge "fix BufferItem flatten/unflatten alignment" into mnc-dev
* commit '
041b945e07168712fd4d2fec06f76aeaeaa5fc9e':
fix BufferItem flatten/unflatten alignment
Chong Zhang [Fri, 22 May 2015 19:04:05 +0000 (19:04 +0000)]
Merge "fix BufferItem flatten/unflatten alignment" into mnc-dev
Chong Zhang [Fri, 22 May 2015 17:54:25 +0000 (10:54 -0700)]
fix BufferItem flatten/unflatten alignment
bug:
21370100
Change-Id: Ia3991dc591c176bdbd1d78d1804aa22777525b62
Johan Euphrosine [Thu, 21 May 2015 08:15:34 +0000 (01:15 -0700)]
frameworks/native/docs: add doxygen configuration
Change-Id: I7803d9beceac46488869e4874f6f5f7a7925a796
Adam Lesinski [Mon, 18 May 2015 22:19:30 +0000 (15:19 -0700)]
Merge commit '
217a04ba' into manualmerge
Change-Id: I526cf2be7949fa52ce0f70f9a1f671669140679a
Michael Lentine [Mon, 18 May 2015 21:52:49 +0000 (21:52 +0000)]
am
699a32bc: Merge "Refactor ConsumerBase and it\'s derived classes." into mnc-dev
* commit '
699a32bcdfaf0390a269a275b979d46ca815654a':
Refactor ConsumerBase and it's derived classes.
Adam Powell [Mon, 18 May 2015 21:30:15 +0000 (21:30 +0000)]
Merge "Adding round qualifier constant to native API." into mnc-dev
Michael Lentine [Mon, 18 May 2015 21:29:39 +0000 (21:29 +0000)]
Merge "Refactor ConsumerBase and it's derived classes." into mnc-dev
Michael Lentine [Mon, 18 May 2015 20:41:23 +0000 (13:41 -0700)]
Refactor ConsumerBase and it's derived classes.
Move setDefaultBufferSize, setDefaultBufferFormat, and
setDefaultBufferDataSpace into ConsumerBase and remove them from
CpuConsumer and BufferItemConsumer.
Bug:
19977701
Change-Id: Ic68992464c5da6da7a41c4063a53029a69efcd1b
Elliott Hughes [Sat, 16 May 2015 00:49:44 +0000 (00:49 +0000)]
am
bfb1f1cc: Don\'t use TEMP_FAILURE_RETRY on close in frameworks/native.
* commit '
bfb1f1cc832840b7232c25a91d49eb39aa79687f':
Don't use TEMP_FAILURE_RETRY on close in frameworks/native.
Elliott Hughes [Sat, 16 May 2015 00:43:19 +0000 (00:43 +0000)]
am
b8e6cb08: am
e814b43c: Merge "Don\'t use TEMP_FAILURE_RETRY on close in frameworks/native."
* commit '
b8e6cb08ebcf7b55fd8d94f3ecf29f73a7886fa8':
Don't use TEMP_FAILURE_RETRY on close in frameworks/native.
Elliott Hughes [Sat, 16 May 2015 00:35:35 +0000 (00:35 +0000)]
am
e814b43c: Merge "Don\'t use TEMP_FAILURE_RETRY on close in frameworks/native."
* commit '
e814b43c581b16e144328c405a003ffece9ebf4d':
Don't use TEMP_FAILURE_RETRY on close in frameworks/native.
Elliott Hughes [Sat, 16 May 2015 00:05:40 +0000 (17:05 -0700)]
Don't use TEMP_FAILURE_RETRY on close in frameworks/native.
Bug: http://b/
20501816
Change-Id: Id13a62f02243c6c4831e2f47944dc34fa822f5b6
(cherry picked from commit
997abb668b9248c2174c6cf169a0b7c6a02fd2cb)
Elliott Hughes [Sat, 16 May 2015 00:26:09 +0000 (00:26 +0000)]
Merge "Don't use TEMP_FAILURE_RETRY on close in frameworks/native."
Elliott Hughes [Sat, 16 May 2015 00:05:40 +0000 (17:05 -0700)]
Don't use TEMP_FAILURE_RETRY on close in frameworks/native.
Bug: http://b/
20501816
Change-Id: Id13a62f02243c6c4831e2f47944dc34fa822f5b6
Adam Lesinski [Thu, 14 May 2015 21:28:32 +0000 (14:28 -0700)]
Adding round qualifier constant to native API.
Change-Id: I43e6c029412d0ed1d345c16fdce90e2879c52a8e
John Reck [Fri, 15 May 2015 20:11:14 +0000 (20:11 +0000)]
John Reck [Fri, 15 May 2015 17:00:34 +0000 (10:00 -0700)]
Fix async_stop
Change-Id: I68a258cf71cfcd999bbd568ab3c96255c11bec41
John Reck [Thu, 14 May 2015 23:54:51 +0000 (23:54 +0000)]
am
3db36803: Merge "Add ConsumerBase::isAbandoned" into mnc-dev
* commit '
3db36803b247bfbb582632be58416a0a11d1227b':
Add ConsumerBase::isAbandoned
John Reck [Thu, 14 May 2015 23:27:45 +0000 (23:27 +0000)]
Merge "Add ConsumerBase::isAbandoned" into mnc-dev
John Reck [Thu, 14 May 2015 22:55:11 +0000 (15:55 -0700)]
Add ConsumerBase::isAbandoned
Bug:
20105644
Change-Id: I21526b5397ea51a15500c44a99daa9d75fc4ea67
Dan Stoza [Thu, 14 May 2015 19:30:37 +0000 (19:30 +0000)]
am
47948791: Merge "SurfaceFlinger: Handle EGL errors more cleanly" into mnc-dev
* commit '
47948791864ccaecac21d94c30a428b549247b67':
SurfaceFlinger: Handle EGL errors more cleanly
Michael Lentine [Thu, 14 May 2015 19:30:13 +0000 (19:30 +0000)]
am
51c8c502: Merge "Modify EGL to disconnect the window when the surface gets destroyed." into mnc-dev
* commit '
51c8c502f63624af8090fe42477b95791faec2c9':
Modify EGL to disconnect the window when the surface gets destroyed.
Michael Wright [Thu, 14 May 2015 19:29:01 +0000 (19:29 +0000)]
am
7c000280: Merge changes from topic \'button_actions\' into mnc-dev
* commit '
7c000280a57f352c2485dcaea1d5bfe20f7bfe63':
Fix input tests to work with new MotionEvent member
Revert "Revert "Add new MotionEvent actions for button press and release.""
Michael Wright [Thu, 14 May 2015 19:28:18 +0000 (19:28 +0000)]
am
c921ce26: Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev
* commit '
c921ce268155e8e1d75bd423514bb5a3ee363440':
Revert "Add new MotionEvent actions for button press and release."
Michael Wright [Thu, 14 May 2015 19:28:10 +0000 (19:28 +0000)]
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.
Dan Stoza [Thu, 14 May 2015 18:19:03 +0000 (18:19 +0000)]
am
81103f12: am
553cbb25: Merge "SurfaceFlinger: Handle EGL errors more cleanly"
* commit '
81103f128d651d705c90b3ab9fe55bff674320ef':
SurfaceFlinger: Handle EGL errors more cleanly
Dan Stoza [Thu, 14 May 2015 18:06:55 +0000 (18:06 +0000)]
am
553cbb25: Merge "SurfaceFlinger: Handle EGL errors more cleanly"
* commit '
553cbb254478e7875aa3e4a95838b1811095e328':
SurfaceFlinger: Handle EGL errors more cleanly
Dan Stoza [Thu, 14 May 2015 17:56:27 +0000 (17:56 +0000)]
Merge "SurfaceFlinger: Handle EGL errors more cleanly"
Dan Stoza [Thu, 14 May 2015 16:27:25 +0000 (09:27 -0700)]
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
65476f3332641066a99e22338bf5cf49ce4af642)
Dan Stoza [Thu, 14 May 2015 17:42:20 +0000 (17:42 +0000)]
Merge "SurfaceFlinger: Handle EGL errors more cleanly" into mnc-dev
Dan Stoza [Thu, 14 May 2015 16:27:25 +0000 (09:27 -0700)]
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
Michael Lentine [Thu, 14 May 2015 16:39:27 +0000 (16:39 +0000)]
Merge "Modify EGL to disconnect the window when the surface gets destroyed." into mnc-dev
Michael Wright [Thu, 14 May 2015 15:31:10 +0000 (15:31 +0000)]
Merge changes from topic 'button_actions' into mnc-dev
* changes:
Fix input tests to work with new MotionEvent member
Revert "Revert "Add new MotionEvent actions for button press and release.""
Michael Wright [Thu, 14 May 2015 15:29:13 +0000 (16:29 +0100)]
Fix input tests to work with new MotionEvent member
Change-Id: I0dde0f91f693903f26edc116b5dbcbf33bac2b93
Michael Wright [Thu, 14 May 2015 13:48:03 +0000 (14:48 +0100)]
Revert "Revert "Add new MotionEvent actions for button press and release.""
This reverts commit
70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.
Michael Wright [Thu, 14 May 2015 13:47:07 +0000 (13:47 +0000)]
Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev
Michael Wright [Thu, 14 May 2015 13:46:17 +0000 (14:46 +0100)]
Revert "Add new MotionEvent actions for button press and release."
This reverts commit
48a8a0e4322969e1551536d6183af3a1faa2240b.
Michael Wright [Thu, 14 May 2015 13:31:24 +0000 (13:31 +0000)]
Merge "Add new MotionEvent actions for button press and release." into mnc-dev
Michael Wright [Mon, 11 May 2015 18:52:27 +0000 (19:52 +0100)]
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
Hiroshi Yamauchi [Wed, 13 May 2015 23:38:07 +0000 (23:38 +0000)]
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.
Hiroshi Yamauchi [Wed, 13 May 2015 22:59:45 +0000 (22:59 +0000)]
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.
Hiroshi Yamauchi [Wed, 13 May 2015 22:47:42 +0000 (22:47 +0000)]
Merge "Replace JNI primitive array critical calls with non-critical ones."
Michael Lentine [Wed, 23 Jul 2014 17:19:41 +0000 (10:19 -0700)]
Modify EGL to disconnect the window when the surface gets destroyed.
Bug:
14445579
Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
Dmitriy Ivanov [Wed, 13 May 2015 22:34:48 +0000 (22:34 +0000)]
am
af3a3778: Merge "Switch libGLESv1_CM/libGLESv2 to hash-style=both" into mnc-dev
* commit '
af3a3778c2c17a8064da599bcabb7d141f59f9af':
Switch libGLESv1_CM/libGLESv2 to hash-style=both
Dmitriy Ivanov [Wed, 13 May 2015 22:11:17 +0000 (22:11 +0000)]
Merge "Switch libGLESv1_CM/libGLESv2 to hash-style=both" into mnc-dev
Dmitriy Ivanov [Wed, 13 May 2015 22:05:07 +0000 (15:05 -0700)]
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
Hiroshi Yamauchi [Wed, 13 May 2015 20:11:30 +0000 (13:11 -0700)]
Replace JNI primitive array critical calls with non-critical ones.
The glgen part.
(cherry pick commit
4e7de461c18278a31be83e7c9074a02fbb6e9475)
Bug:
19235243
Change-Id: I0d1e78acf39feb37a67e857216a6d52f4cede180
Hiroshi Yamauchi [Wed, 13 May 2015 19:05:32 +0000 (19:05 +0000)]
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.
Hiroshi Yamauchi [Wed, 13 May 2015 18:37:56 +0000 (18:37 +0000)]
Merge "Replace JNI primitive array critical calls with non-critical ones." into mnc-dev
Dan Stoza [Wed, 13 May 2015 18:19:38 +0000 (18:19 +0000)]
am
ac8611db: am
f984bad9: Merge "Fix PTS handling for buffer replacement"
* commit '
ac8611db6a9b42cd6b185a877c2f5d4e470e2e89':
Fix PTS handling for buffer replacement
Dan Stoza [Wed, 13 May 2015 18:19:37 +0000 (18:19 +0000)]
am
a1f8b324: am
bbb010b7: Merge "binder: add uint64 support to Parcel."
* commit '
a1f8b3249549b4b38c087e8843167854250503b3':
binder: add uint64 support to Parcel.
Dan Stoza [Wed, 13 May 2015 18:04:10 +0000 (18:04 +0000)]
am
f984bad9: Merge "Fix PTS handling for buffer replacement"
* commit '
f984bad94aa98f49a3959f3119114e94a547b9bf':
Fix PTS handling for buffer replacement
Dan Stoza [Wed, 13 May 2015 18:04:08 +0000 (18:04 +0000)]
am
bbb010b7: Merge "binder: add uint64 support to Parcel."
* commit '
bbb010b79cf824611cc6dfc5984333ac8f2177bd':
binder: add uint64 support to Parcel.
Dan Stoza [Wed, 13 May 2015 17:53:22 +0000 (17:53 +0000)]
Merge "Fix PTS handling for buffer replacement"
Dan Stoza [Wed, 13 May 2015 17:52:46 +0000 (17:52 +0000)]
Merge "binder: add uint64 support to Parcel."
Michael Wright [Wed, 13 May 2015 17:15:46 +0000 (17:15 +0000)]
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.
Michael Wright [Wed, 13 May 2015 17:15:46 +0000 (17:15 +0000)]
am
4eed0f8f: Merge "Synthesize events for pressure and button changes." into mnc-dev
* commit '
4eed0f8f8dd3673e55a93c0b62b8b9ebefa135cf':
Synthesize events for pressure and button changes.
Dan Stoza [Wed, 13 May 2015 17:15:45 +0000 (17:15 +0000)]
am
09d561db: Merge "Fix PTS handling for buffer replacement" into mnc-dev
* commit '
09d561dbee9a28db9632ff3d51f633c18aefe023':
Fix PTS handling for buffer replacement
Michael Wright [Wed, 13 May 2015 16:56:05 +0000 (16:56 +0000)]
Merge "Use previous pressure value if the current fusion data is zero." into mnc-dev
Michael Wright [Wed, 13 May 2015 16:55:47 +0000 (16:55 +0000)]
Merge "Synthesize events for pressure and button changes." into mnc-dev
Dan Stoza [Tue, 12 May 2015 19:56:16 +0000 (12:56 -0700)]
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
a4650a50a0b35e9e4342d6600b6eb24fd94bb8e5)
Ronghua Wu [Mon, 16 Mar 2015 18:11:07 +0000 (11:11 -0700)]
binder: add uint64 support to Parcel.
Bug:
19620911
Change-Id: Ifce5319e4e35afd344dead67ab7ba1cd399476a3
(cherry picked from commit
2d13afdfa1f43973bf3cb917c7d6496a38baa446)
Dan Stoza [Wed, 13 May 2015 16:34:05 +0000 (16:34 +0000)]
Merge "Fix PTS handling for buffer replacement" into mnc-dev
Dan Stoza [Wed, 13 May 2015 16:32:06 +0000 (16:32 +0000)]
am
9f5f6ab0: am
bfe211f0: Merge "libgui: Always allow allocation on connect"
* commit '
9f5f6ab0a2b9b1f16040942c21fe9dda6cc079bf':
libgui: Always allow allocation on connect
Kenny Root [Wed, 13 May 2015 16:10:17 +0000 (09:10 -0700)]
resolved conflicts for merge of
91e485fa to mnc-dev-plus-aosp
Change-Id: Ibb4a2058e585218bdeaf4c1d568093fbbd8f6478
Dan Stoza [Wed, 13 May 2015 15:22:05 +0000 (15:22 +0000)]
am
2089a65c: am
38d7f755: Merge "libgui: Hook up onFrameReplaced"
* commit '
2089a65c9b6b3bb6fc67fe6911c57a30f47e2044':
libgui: Hook up onFrameReplaced
Adam Lesinski [Wed, 13 May 2015 03:59:06 +0000 (03:59 +0000)]
am
4b4820db: Merge "Verify that the native handle was created" into mnc-dev
* commit '
4b4820db4b83875ec5bbae11e468f36f21e5334c':
Verify that the native handle was created
Adam Lesinski [Wed, 13 May 2015 03:38:35 +0000 (03:38 +0000)]
Merge "Verify that the native handle was created" into mnc-dev
Adam Lesinski [Wed, 13 May 2015 00:35:48 +0000 (17:35 -0700)]
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
Dan Stoza [Tue, 12 May 2015 22:40:47 +0000 (22:40 +0000)]
am
bfe211f0: Merge "libgui: Always allow allocation on connect"
* commit '
bfe211f00a2b9032ddf04f549db0c9b82666b3be':
libgui: Always allow allocation on connect
Dan Stoza [Tue, 12 May 2015 22:33:38 +0000 (22:33 +0000)]
Merge "libgui: Always allow allocation on connect"
Dan Stoza [Tue, 12 May 2015 22:22:18 +0000 (22:22 +0000)]
am
48cb8310: Merge "libgui: Always allow allocation on connect" into mnc-dev
* commit '
48cb8310e267d177856ad9b2af7b9949d7d62424':
libgui: Always allow allocation on connect
Johan Euphrosine [Tue, 12 May 2015 22:15:51 +0000 (22:15 +0000)]
am
b9009863: Merge "frameworks/native: document native types and enums"
* commit '
b9009863cb45acd7455c0ac873fb8e6a3e7a4f99':
frameworks/native: document native types and enums
Johan Euphrosine [Tue, 12 May 2015 22:05:21 +0000 (22:05 +0000)]
Merge "frameworks/native: document native types and enums"
Dan Stoza [Tue, 12 May 2015 21:55:15 +0000 (14:55 -0700)]
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
2b83cc920ac98498bee161e2b0e7befdfc82ca2b)
Dan Stoza [Tue, 12 May 2015 21:57:27 +0000 (21:57 +0000)]
Merge "libgui: Always allow allocation on connect" into mnc-dev
Dan Stoza [Tue, 12 May 2015 21:55:15 +0000 (14:55 -0700)]
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
Johan Euphrosine [Sat, 28 Mar 2015 00:15:43 +0000 (17:15 -0700)]
frameworks/native: document native types and enums
Change-Id: Id94b610f27b87426abb30e13484cbd16990aa995
Hiroshi Yamauchi [Sat, 9 May 2015 00:54:55 +0000 (17:54 -0700)]
Replace JNI primitive array critical calls with non-critical ones.
The glgen part.
Bug:
19235243
Change-Id: I69dfa84f15366808b964517c1ba270ddeb3c5940
Dan Stoza [Tue, 12 May 2015 19:56:16 +0000 (12:56 -0700)]
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
Aravind Akella [Tue, 12 May 2015 19:30:30 +0000 (19:30 +0000)]
am
af8ed3f0: Merge "Improve logging in SensorService dump output." into mnc-dev
* commit '
af8ed3f06cf5a0fd37357b438da803f53f33fa56':
Improve logging in SensorService dump output.
OSDN Git Service
