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
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
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
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
Jesse Hall
0d4d431429
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
2015-05-12 17:54:49 +00:00
Jesse Hall
2a7dde5803
Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension" into mnc-dev
2015-05-12 17:31:25 +00:00
Dan Stoza
2089a65c9b
am 38d7f755: Merge "libgui: Hook up onFrameReplaced"
...
* commit '38d7f7550f5848b33b2e0a2048687fc22f708fda':
libgui: Hook up onFrameReplaced
2015-05-12 17:25:00 +00:00
Dan Stoza
38d7f7550f
Merge "libgui: Hook up onFrameReplaced"
2015-05-12 17:18:12 +00:00
Dan Stoza
c340dc0a75
am dc13c5b8: libgui: Hook up onFrameReplaced
...
* commit 'dc13c5b85b099050c73297a19f1ef89308f7620b':
libgui: Hook up onFrameReplaced
2015-05-12 16:49:10 +00:00
Dan Stoza
a3b6693272
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 dc13c5b85b
)
2015-05-12 09:35:29 -07:00
Jesse Hall
408e59f63a
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
2015-05-12 08:42:05 -07:00
Dan Stoza
dc13c5b85b
libgui: Hook up onFrameReplaced
...
This completes the plumbing from ConsumerListener::onFrameReplaced into
SurfaceFlinger (and other consumers that may care).
Change-Id: I376e78ace95d6748e8662e6b4d47c0dfa697a300
2015-05-11 15:33:01 -07:00
Jesse Hall
783011cca3
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
2015-05-11 21:55:44 +00:00
Jesse Hall
eec21aeec9
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
2015-05-11 21:42:24 +00:00
Jesse Hall
364ed95453
Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension"
2015-05-11 21:31:44 +00:00
Jesse Hall
5245af3cb7
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
2015-05-11 13:59:15 -07:00
Aravind Akella
adc3b4cd8f
am be451b57: Merge "Fix the arguments to memcpy." into mnc-dev
...
* commit 'be451b57b97c21747c637f4af06743318d42c36c':
Fix the arguments to memcpy.
2015-05-09 00:41:56 +00:00
Aravind Akella
be451b57b9
Merge "Fix the arguments to memcpy." into mnc-dev
2015-05-09 00:17:40 +00:00
Aravind Akella
08f04bf36c
Fix the arguments to memcpy.
...
Change-Id: Ieaee26f46f43a9d412537047566178985370198b
2015-05-08 15:59:23 -07:00
Dan Stoza
9572f97172
am 98a13a14: Merge "SF: Apply pending transactions to new sidebands" into mnc-dev
...
* commit '98a13a1475682870f5121446f9c80aa18855c884':
SF: Apply pending transactions to new sidebands
2015-05-08 16:54:40 +00:00
Dan Stoza
98a13a1475
Merge "SF: Apply pending transactions to new sidebands" into mnc-dev
2015-05-08 16:32:27 +00:00
Pat Tjin
814e728b33
am deb6baa6: Merge "surfaceflinger: Fix range check for getFormat" into mnc-dev
...
* commit 'deb6baa6b349cc5c176b911bcd1e551d15404bf7':
surfaceflinger: Fix range check for getFormat
2015-05-07 21:21:13 +00:00
Pat Tjin
deb6baa6b3
Merge "surfaceflinger: Fix range check for getFormat" into mnc-dev
2015-05-07 20:57:49 +00:00
Svet Ganov
e68dad2ab2
am 5fa32d4b: Fix broken NDK sensor manager API.
...
* commit '5fa32d4b08843d0aeca567a173227e8e37322e8e':
Fix broken NDK sensor manager API.
2015-05-07 20:32:08 +00:00
Ajay Dudani
4e3e30c2d5
surfaceflinger: Fix range check for getFormat
...
Fix potential buffer overflow error in getFormat with indices
greater than MAX_HWC_DISPLAYS.
Change-Id: I5e5b69d8d043e900f5e33ca9a62e94ae5f857b68
2015-05-07 13:23:32 -07:00
Svet Ganov
5fa32d4b08
Fix broken NDK sensor manager API.
...
Change-Id: I21bb8b0dcfd3f1c812753a9fd77dea792e7155f2
2015-05-07 12:50:27 -07:00
Aaron Schulman
69620f2206
am cbe13ef5: Added Voltage and Current regulator ftrace events to atrace
...
* commit 'cbe13ef59b25b6df226c09b9351f0f615bc68dda':
Added Voltage and Current regulator ftrace events to atrace
2015-05-07 17:43:30 +00:00
Chris Craik
274daec7d5
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
2015-05-07 16:45:29 +00:00
Chris Craik
9a104951a3
am 05815996: Merge "Added Voltage and Current regulator ftrace events to atrace"
...
* commit '05815996c965b99c4cc4ea96f6b6c4a9123cdf1c':
Added Voltage and Current regulator ftrace events to atrace
2015-05-07 16:34:00 +00:00
Aaron Schulman
cbe13ef59b
Added Voltage and Current regulator ftrace events to atrace
...
Cherry-pick of c2c6ecd119
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>
2015-05-07 09:23:23 -07:00
Chris Craik
05815996c9
Merge "Added Voltage and Current regulator ftrace events to atrace"
2015-05-07 16:20:52 +00:00
Dan Stoza
e63633e53d
am c037ca7f: am c4e98c40: Merge "SF: Apply pending transactions to new sidebands"
...
* commit 'c037ca7fb1c0163c58e8707d1184bb73aabc0730':
SF: Apply pending transactions to new sidebands
2015-05-06 23:48:07 +00:00
Dan Stoza
c037ca7fb1
am c4e98c40: Merge "SF: Apply pending transactions to new sidebands"
...
* commit 'c4e98c40deacb54ad7288337927506cb5798dfa5':
SF: Apply pending transactions to new sidebands
2015-05-06 17:01:06 +00:00
Dan Stoza
c4e98c40de
Merge "SF: Apply pending transactions to new sidebands"
2015-05-06 16:50:38 +00:00
Dan Stoza
12e0a27aa3
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)
2015-05-05 16:05:32 -07:00
Dan Stoza
8afb76731a
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)
2015-05-05 14:21:20 -07:00
Dan Stoza
634ccf2740
am d9fd7a78: am e357f649: Merge "libgui: Clear frame number while freeing slot"
...
* commit 'd9fd7a786477334d380e18a667a39a3ebe08ed31':
libgui: Clear frame number while freeing slot
2015-05-04 17:17:41 +00:00
Dan Stoza
d9fd7a7864
am e357f649: Merge "libgui: Clear frame number while freeing slot"
...
* commit 'e357f6494539cf40a87f77a85e9c0a694c331b86':
libgui: Clear frame number while freeing slot
2015-05-04 17:06:30 +00:00
Dan Stoza
e357f64945
Merge "libgui: Clear frame number while freeing slot"
2015-05-04 16:57:54 +00:00
Dan Stoza
3515d1640a
am 79e28789: Merge "libgui: Clear frame number while freeing slot" into mnc-dev
...
* commit '79e287890da9de37a834cceebdefe32a7d3ac0ac':
libgui: Clear frame number while freeing slot
2015-05-04 16:54:52 +00:00