OSDN Git Service
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 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.
Aravind Akella [Tue, 12 May 2015 19:12:42 +0000 (19:12 +0000)]
Merge "Improve logging in SensorService dump output." into mnc-dev
Aravind Akella [Thu, 7 May 2015 19:40:52 +0000 (12:40 -0700)]
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
Jesse Hall [Tue, 12 May 2015 17:54:49 +0000 (17:54 +0000)]
am
2a7dde58: Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension" into mnc-dev
* commit '
2a7dde58036e02b2417e49c8965d4a518d981b0b':
libEGL: whitelist the EGL_KHR_create_context_no_error extension
Jesse Hall [Tue, 12 May 2015 17:31:23 +0000 (17:31 +0000)]
Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension" into mnc-dev
Dan Stoza [Tue, 12 May 2015 17:25:00 +0000 (17:25 +0000)]
am
38d7f755: Merge "libgui: Hook up onFrameReplaced"
* commit '
38d7f7550f5848b33b2e0a2048687fc22f708fda':
libgui: Hook up onFrameReplaced
Dan Stoza [Tue, 12 May 2015 17:18:11 +0000 (17:18 +0000)]
Merge "libgui: Hook up onFrameReplaced"
Dan Stoza [Tue, 12 May 2015 16:49:10 +0000 (16:49 +0000)]
am
dc13c5b8: libgui: Hook up onFrameReplaced
* commit '
dc13c5b85b099050c73297a19f1ef89308f7620b':
libgui: Hook up onFrameReplaced
Dan Stoza [Mon, 11 May 2015 22:33:01 +0000 (15:33 -0700)]
libgui: Hook up onFrameReplaced
This completes the plumbing from ConsumerListener::onFrameReplaced into
SurfaceFlinger (and other consumers that may care).
Change-Id: I376e78ace95d6748e8662e6b4d47c0dfa697a300
(cherry picked from commit
dc13c5b85b099050c73297a19f1ef89308f7620b)
Jesse Hall [Fri, 24 Apr 2015 08:40:42 +0000 (01:40 -0700)]
libEGL: whitelist the EGL_KHR_create_context_no_error extension
Allow EGL implementations to expose the
EGL_KHR_create_context_no_error extension if they wish.
https://www.khronos.org/registry/egl/extensions/KHR/EGL_KHR_create_context_no_error.txt
Change-Id: I3290ccc2a69a1fa0b00ec3f1aa4f876906c64bfb
Michael Wright [Thu, 23 Apr 2015 16:39:53 +0000 (17:39 +0100)]
Use previous pressure value if the current fusion data is zero.
Occasionally we'll receive the stylus up signal (pressure = 0) before
we receive the touch screen up signal. Rather than giving pointer a
pressure value of 0 (which is one of the signals of hovering) or
falling back to the touchscreen pressure values (which would make for
an inconsistent stream), use the previous pressure value which should
always be non-zero for a stream of fused data.
Bug:
20449776
Change-Id: I71eb97e7c4ea53e42b0eb54fc1f8ae7f89aad9d1
Michael Wright [Tue, 21 Apr 2015 18:02:58 +0000 (19:02 +0100)]
Synthesize events for pressure and button changes.
Even when there isn't movement on the touchscreen we should produce
events for pressure and button state changes generated by external
stylii.
Change-Id: I9fd7ba85902d5d6bfb28d5e5ff5d8f340a94c2bf
Dan Stoza [Mon, 11 May 2015 22:33:01 +0000 (15:33 -0700)]
libgui: Hook up onFrameReplaced
This completes the plumbing from ConsumerListener::onFrameReplaced into
SurfaceFlinger (and other consumers that may care).
Change-Id: I376e78ace95d6748e8662e6b4d47c0dfa697a300
Jesse Hall [Mon, 11 May 2015 21:55:44 +0000 (21:55 +0000)]
am
eec21aee: am
364ed954: Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension"
* commit '
eec21aeec9a1d210b9e81633ab43a178479c2b8e':
libEGL: whitelist the EGL_KHR_create_context_no_error extension
Jesse Hall [Mon, 11 May 2015 21:42:24 +0000 (21:42 +0000)]
am
364ed954: Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension"
* commit '
364ed9545382539ab9875555947bc18ec94bb82b':
libEGL: whitelist the EGL_KHR_create_context_no_error extension
Jesse Hall [Mon, 11 May 2015 21:31:44 +0000 (21:31 +0000)]
Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension"
Jesse Hall [Fri, 24 Apr 2015 08:40:42 +0000 (01:40 -0700)]
libEGL: whitelist the EGL_KHR_create_context_no_error extension
Allow EGL implementations to expose the
EGL_KHR_create_context_no_error extension if they wish.
https://www.khronos.org/registry/egl/extensions/KHR/EGL_KHR_create_context_no_error.txt
Change-Id: I3290ccc2a69a1fa0b00ec3f1aa4f876906c64bfb
Aravind Akella [Sat, 9 May 2015 00:41:56 +0000 (00:41 +0000)]
am
be451b57: Merge "Fix the arguments to memcpy." into mnc-dev
* commit '
be451b57b97c21747c637f4af06743318d42c36c':
Fix the arguments to memcpy.
Aravind Akella [Sat, 9 May 2015 00:17:40 +0000 (00:17 +0000)]
Merge "Fix the arguments to memcpy." into mnc-dev
Aravind Akella [Fri, 8 May 2015 22:59:23 +0000 (15:59 -0700)]
Fix the arguments to memcpy.
Change-Id: Ieaee26f46f43a9d412537047566178985370198b
Dan Stoza [Fri, 8 May 2015 16:54:40 +0000 (16:54 +0000)]
am
98a13a14: Merge "SF: Apply pending transactions to new sidebands" into mnc-dev
* commit '
98a13a1475682870f5121446f9c80aa18855c884':
SF: Apply pending transactions to new sidebands
Dan Stoza [Fri, 8 May 2015 16:32:26 +0000 (16:32 +0000)]
Merge "SF: Apply pending transactions to new sidebands" into mnc-dev
Pat Tjin [Thu, 7 May 2015 21:21:13 +0000 (21:21 +0000)]
am
deb6baa6: Merge "surfaceflinger: Fix range check for getFormat" into mnc-dev
* commit '
deb6baa6b349cc5c176b911bcd1e551d15404bf7':
surfaceflinger: Fix range check for getFormat
Pat Tjin [Thu, 7 May 2015 20:57:48 +0000 (20:57 +0000)]
Merge "surfaceflinger: Fix range check for getFormat" into mnc-dev
Svet Ganov [Thu, 7 May 2015 20:32:08 +0000 (20:32 +0000)]
am
5fa32d4b: Fix broken NDK sensor manager API.
* commit '
5fa32d4b08843d0aeca567a173227e8e37322e8e':
Fix broken NDK sensor manager API.
Ajay Dudani [Sun, 3 May 2015 18:44:55 +0000 (11:44 -0700)]
surfaceflinger: Fix range check for getFormat
Fix potential buffer overflow error in getFormat with indices
greater than MAX_HWC_DISPLAYS.
Change-Id: I5e5b69d8d043e900f5e33ca9a62e94ae5f857b68
Svet Ganov [Thu, 7 May 2015 17:50:59 +0000 (10:50 -0700)]
Fix broken NDK sensor manager API.
Change-Id: I21bb8b0dcfd3f1c812753a9fd77dea792e7155f2
Aaron Schulman [Thu, 7 May 2015 17:43:30 +0000 (17:43 +0000)]
am
cbe13ef5: Added Voltage and Current regulator ftrace events to atrace
* commit '
cbe13ef59b25b6df226c09b9351f0f615bc68dda':
Added Voltage and Current regulator ftrace events to atrace
Chris Craik [Thu, 7 May 2015 16:45:29 +0000 (16:45 +0000)]
am
9a104951: am
05815996: Merge "Added Voltage and Current regulator ftrace events to atrace"
* commit '
9a104951a387a84709705405732a69f690d2c9f0':
Added Voltage and Current regulator ftrace events to atrace
Chris Craik [Thu, 7 May 2015 16:34:00 +0000 (16:34 +0000)]
am
05815996: Merge "Added Voltage and Current regulator ftrace events to atrace"
* commit '
05815996c965b99c4cc4ea96f6b6c4a9123cdf1c':
Added Voltage and Current regulator ftrace events to atrace
Aaron Schulman [Wed, 25 Feb 2015 16:37:09 +0000 (08:37 -0800)]
Added Voltage and Current regulator ftrace events to atrace
Cherry-pick of
c2c6ecd1195481f5813a721a7d20a73c0795c135 from AOSP
Tracing the state of the voltage and current regulators enables a developer
to attribute power consumption measurements to specific perhipherals and
cores. Unlike other indirect methods of tracing when peripherals and cores
are toggled, the regulator ftrace event indicates the exact point in time
when the kernel switches on or off the device. For example, in the following
trace, a developer can see exactly when the krait2 core starts receiving
power, and and when the voltage is set for voltage scaling.
mpdecision-2172 [000] ...1 1566.665481: regulator_enable: name=krait2
mpdecision-2172 [000] ...1 1566.665493: regulator_enable_delay: name=krait2
mpdecision-2172 [000] ...1 1566.665495: regulator_enable_complete: name=krait2
<...>-4133 [002] ...1 1566.666891: regulator_set_voltage: name=krait2 (
1075000-
1100000)
Change-Id: Ia322206ef74496daf1d9baa03545d8e89e398487
Signed-off-by: Aaron Schulman <aschulman@google.com>
Chris Craik [Thu, 7 May 2015 16:20:52 +0000 (16:20 +0000)]
Merge "Added Voltage and Current regulator ftrace events to atrace"
Dan Stoza [Wed, 6 May 2015 23:48:07 +0000 (23:48 +0000)]
am
c037ca7f: am
c4e98c40: Merge "SF: Apply pending transactions to new sidebands"
* commit '
c037ca7fb1c0163c58e8707d1184bb73aabc0730':
SF: Apply pending transactions to new sidebands
Dan Stoza [Wed, 6 May 2015 17:01:06 +0000 (17:01 +0000)]
am
c4e98c40: Merge "SF: Apply pending transactions to new sidebands"
* commit '
c4e98c40deacb54ad7288337927506cb5798dfa5':
SF: Apply pending transactions to new sidebands
Dan Stoza [Wed, 6 May 2015 16:50:38 +0000 (16:50 +0000)]
Merge "SF: Apply pending transactions to new sidebands"
Dan Stoza [Tue, 5 May 2015 21:00:52 +0000 (14:00 -0700)]
SF: Apply pending transactions to new sidebands
When a Layer's sideband stream is set, apply any pending transactions.
Otherwise they would never be applied since sideband streams don't
trigger updates by pushing new buffers.
Bug:
20125898
Change-Id: I0c7a91cdf84e6205801f4ab64eee0b09e4c0b3e0
(cherry picked from commit
3b04e1383eca6cb1d43ebe23a421c427007690c7)
Dan Stoza [Tue, 5 May 2015 21:00:52 +0000 (14:00 -0700)]
SF: Apply pending transactions to new sidebands
When a Layer's sideband stream is set, apply any pending transactions.
Otherwise they would never be applied since sideband streams don't
trigger updates by pushing new buffers.
Bug:
20125898
Change-Id: I0c7a91cdf84e6205801f4ab64eee0b09e4c0b3e0
(cherry picked from commit
3b04e1383eca6cb1d43ebe23a421c427007690c7)
Dan Stoza [Mon, 4 May 2015 17:17:41 +0000 (17:17 +0000)]
am
d9fd7a78: am
e357f649: Merge "libgui: Clear frame number while freeing slot"
* commit '
d9fd7a786477334d380e18a667a39a3ebe08ed31':
libgui: Clear frame number while freeing slot
Dan Stoza [Mon, 4 May 2015 17:06:30 +0000 (17:06 +0000)]
am
e357f649: Merge "libgui: Clear frame number while freeing slot"
* commit '
e357f6494539cf40a87f77a85e9c0a694c331b86':
libgui: Clear frame number while freeing slot
Dan Stoza [Mon, 4 May 2015 16:57:53 +0000 (16:57 +0000)]
Merge "libgui: Clear frame number while freeing slot"
Dan Stoza [Mon, 4 May 2015 16:54:52 +0000 (16:54 +0000)]
am
79e28789: Merge "libgui: Clear frame number while freeing slot" into mnc-dev
* commit '
79e287890da9de37a834cceebdefe32a7d3ac0ac':
libgui: Clear frame number while freeing slot
Dan Stoza [Mon, 4 May 2015 16:33:46 +0000 (16:33 +0000)]
Merge "libgui: Clear frame number while freeing slot" into mnc-dev
Sasha Levitskiy [Mon, 4 May 2015 00:14:28 +0000 (00:14 +0000)]
am
b0474e78: SensorServiceTest: Fix build, warnings.
* commit '
b0474e78df2a778c42c6746da815f397bb2df374':
SensorServiceTest: Fix build, warnings.
Sasha Levitskiy [Sun, 3 May 2015 04:03:44 +0000 (21:03 -0700)]
SensorServiceTest: Fix build, warnings.
Change-Id: I3ed5247d3eb6c43d185049cf9011c2ee01b5662e
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Dan Stoza [Fri, 1 May 2015 23:42:55 +0000 (16:42 -0700)]
libgui: Clear frame number while freeing slot
Clears the frame number of a slot when it is freed, since it is used
to determine if a released buffer is stale.
Bug:
20445852
Change-Id: I02415e7b25a1eafe7414d6eb1cedf62ac5543cd9
(cherry picked from commit
52937cd9a543fe66696c38ae50ec141aa70ec1e4)
Dan Stoza [Fri, 1 May 2015 23:42:55 +0000 (16:42 -0700)]
libgui: Clear frame number while freeing slot
Clears the frame number of a slot when it is freed, since it is used
to determine if a released buffer is stale.
Bug:
20445852
Change-Id: I02415e7b25a1eafe7414d6eb1cedf62ac5543cd9
Svetoslav [Fri, 1 May 2015 23:40:51 +0000 (23:40 +0000)]
am
c28fe8f5: Merge "Add body sensors app op - framework native" into mnc-dev
* commit '
c28fe8f5c54c5e98be7664dcffdbd5b324b850d6':
Add body sensors app op - framework native
Svetoslav [Fri, 1 May 2015 23:10:55 +0000 (23:10 +0000)]
Merge "Add body sensors app op - framework native" into mnc-dev
Mark Salyzyn [Fri, 1 May 2015 22:13:40 +0000 (22:13 +0000)]
am
701552f3: am
dfe7e7e6: Merge "dumpstate: report per-partition MMC performance"
* commit '
701552f3689c504957242097a9a552a6f4c2daa0':
dumpstate: report per-partition MMC performance
Mark Salyzyn [Fri, 1 May 2015 22:06:00 +0000 (22:06 +0000)]
am
326842fc: dumpstate: report per-partition MMC performance
* commit '
326842fca4883f1256aa9ed019bb3206ee76fca7':
dumpstate: report per-partition MMC performance
Dan Stoza [Fri, 1 May 2015 22:06:00 +0000 (22:06 +0000)]
am
ba9e1f42: Merge "SurfaceFlinger: Fix PTS on stale buffers" into mnc-dev
* commit '
ba9e1f4241a81eb7c453028ee05da56e290d8ce6':
SurfaceFlinger: Fix PTS on stale buffers
Mark Salyzyn [Fri, 1 May 2015 22:02:12 +0000 (22:02 +0000)]
am
dfe7e7e6: Merge "dumpstate: report per-partition MMC performance"
* commit '
dfe7e7e63fa80a8a9050ea47f69a340e2f7e342d':
dumpstate: report per-partition MMC performance
Mark Salyzyn [Thu, 30 Apr 2015 16:49:41 +0000 (09:49 -0700)]
dumpstate: report per-partition MMC performance
(Cherry pick from commit
540e3de99fa1baa5eaf3eb3d49f4e98fd9f5bd91)
Change-Id: If5cabe186d8377056effa1c0672a90e277cd7221
Mark Salyzyn [Fri, 1 May 2015 21:48:51 +0000 (21:48 +0000)]
Merge "dumpstate: report per-partition MMC performance"
Dan Stoza [Fri, 1 May 2015 21:44:06 +0000 (21:44 +0000)]
Merge "SurfaceFlinger: Fix PTS on stale buffers" into mnc-dev
Svetoslav [Wed, 29 Apr 2015 23:50:41 +0000 (16:50 -0700)]
Add body sensors app op - framework native
Change-Id: I727a2bb1e28ae9158f2df9c74dd0aee977dfd47f
Dan Stoza [Fri, 1 May 2015 20:51:40 +0000 (20:51 +0000)]
am
a0162542: am
bb58111c: Merge "SurfaceFlinger: Fix PTS on stale buffers"
* commit '
a0162542609b1dcd8158644e7ba5ae92e84b95d5':
SurfaceFlinger: Fix PTS on stale buffers
Dan Stoza [Fri, 1 May 2015 20:40:26 +0000 (20:40 +0000)]
am
bb58111c: Merge "SurfaceFlinger: Fix PTS on stale buffers"
* commit '
bb58111c22b41f605a8edb6599fd3df42f6d8e4e':
SurfaceFlinger: Fix PTS on stale buffers
Dan Stoza [Fri, 1 May 2015 20:28:47 +0000 (20:28 +0000)]
Merge "SurfaceFlinger: Fix PTS on stale buffers"
Dan Stoza [Tue, 28 Apr 2015 21:42:06 +0000 (14:42 -0700)]
SurfaceFlinger: Fix PTS on stale buffers
SurfaceFlinger's (Layer's) shadow copy of the BufferQueue queue was
getting out of sync for a few reasons. This change fixes these by
doing the following:
- Adds a check to re-synchronize the shadow copy every time we
successfully acquire a buffer by first dropping stale buffers before
removing the current buffer.
- Avoids trying to perform updates for buffers which have been rejected
(for incorrect dimensions) by SurfaceFlinger.
- Adds IGraphicBufferConsumer::setShadowQueueSize, which allows the
consumer to notify the BufferQueue that it is maintaining a shadow
copy of the queue and prevents it from dropping so many buffers
during acquireBuffer that it ends up returning a buffer for which the
consumer has not yet received an onFrameAvailable call.
Bug:
20096136
Change-Id: I78d0738428005fc19b3be85cc8f1db498043612f
(cherry picked from commit
2e36f2283f48ab764b496490c73a132acf21df3a)
Jeff Sharkey [Fri, 1 May 2015 16:45:50 +0000 (16:45 +0000)]
am
61a3c8de: Merge "Offer to move both code and data together." into mnc-dev
* commit '
61a3c8dec90acebef15ef56cae14efea69279f69':
Offer to move both code and data together.
Jeff Sharkey [Fri, 1 May 2015 16:22:40 +0000 (16:22 +0000)]
Merge "Offer to move both code and data together." into mnc-dev
Jeff Sharkey [Thu, 30 Apr 2015 22:58:19 +0000 (15:58 -0700)]
Offer to move both code and data together.
We now move code under /data/app/com.example when a complete move
is requested. This really only works for new cluster-style installs
that also have native libraries and OAT contained inside.
Teach measuring code about cluster-style installs when measuring
app footprint. Also offer to measure private data space for all
users.
Bug:
19993667,
20275578
Change-Id: I6df7b947cb5cc8a4552f56f4b64a661e8512389f
Dan Stoza [Thu, 30 Apr 2015 22:35:08 +0000 (22:35 +0000)]
am
7b2fc930: Merge "SurfaceFlinger: Limit to 4k Layers" into mnc-dev
* commit '
7b2fc930077b1e6ca5946cae6834902318209474':
SurfaceFlinger: Limit to 4k Layers
OSDN Git Service
