summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-012-0/+93
| | | | | | Bug: 15986092 Change-Id: I272ec070113a0bfc41c637c45a6e1a2ab346e87b
* Don't use TEMP_FAILURE_RETRY on close in frameworks/native.Elliott Hughes2015-05-152-2/+2
| | | | | | Bug: http://b/20501816 Change-Id: Id13a62f02243c6c4831e2f47944dc34fa822f5b6 (cherry picked from commit 997abb668b9248c2174c6cf169a0b7c6a02fd2cb)
* Fix async_stopJohn Reck2015-05-151-1/+1
| | | | Change-Id: I68a258cf71cfcd999bbd568ab3c96255c11bec41
* Merge "Add ConsumerBase::isAbandoned" into mnc-devJohn Reck2015-05-142-0/+8
|\
| * Add ConsumerBase::isAbandonedJohn Reck2015-05-142-0/+8
| | | | | | | | | | Bug: 20105644 Change-Id: I21526b5397ea51a15500c44a99daa9d75fc4ea67
* | Merge "SurfaceFlinger: Handle EGL errors more cleanly" into mnc-devDan Stoza2015-05-142-1/+21
|\ \
| * | SurfaceFlinger: Handle EGL errors more cleanlyDan Stoza2015-05-142-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Modify EGL to disconnect the window when the surface gets destroyed." ↵Michael Lentine2015-05-142-2/+11
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | Modify EGL to disconnect the window when the surface gets destroyed.Michael Lentine2015-05-132-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 14445579 Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
* | | | Merge changes from topic 'button_actions' into mnc-devMichael Wright2015-05-1415-119/+244
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | * changes: Fix input tests to work with new MotionEvent member Revert "Revert "Add new MotionEvent actions for button press and release.""
| * | | Fix input tests to work with new MotionEvent memberMichael Wright2015-05-144-11/+13
| | | | | | | | | | | | | | | | Change-Id: I0dde0f91f693903f26edc116b5dbcbf33bac2b93
| * | | Revert "Revert "Add new MotionEvent actions for button press and release.""Michael Wright2015-05-1412-108/+231
| | | | | | | | | | | | | | | | This reverts commit 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.
* | | | Merge "Revert "Add new MotionEvent actions for button press and release."" ↵Michael Wright2015-05-1412-231/+108
|\ \ \ \ | |/ / / | | | | | | | | into mnc-dev
| * | | Revert "Add new MotionEvent actions for button press and release."Michael Wright2015-05-1412-231/+108
| | | | | | | | | | | | | | | | This reverts commit 48a8a0e4322969e1551536d6183af3a1faa2240b.
* | | | Merge "Add new MotionEvent actions for button press and release." into mnc-devMichael Wright2015-05-1412-108/+231
|\ \ \ \ | |/ / /
| * | | Add new MotionEvent actions for button press and release.Michael Wright2015-05-1412-108/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Switch libGLESv1_CM/libGLESv2 to hash-style=both" into mnc-devDmitriy Ivanov2015-05-131-0/+6
|\ \ \ \
| * | | | Switch libGLESv1_CM/libGLESv2 to hash-style=bothDmitriy Ivanov2015-05-131-0/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Replace JNI primitive array critical calls with non-critical ones." ↵Hiroshi Yamauchi2015-05-1315-161/+395
|\ \ \ \ | |/ / / |/| | | | | | | into mnc-dev
| * | | Replace JNI primitive array critical calls with non-critical ones.Hiroshi Yamauchi2015-05-1215-161/+395
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The glgen part. Bug: 19235243 Change-Id: I69dfa84f15366808b964517c1ba270ddeb3c5940
* | | | Merge "Use previous pressure value if the current fusion data is zero." into ↵Michael Wright2015-05-132-8/+14
|\ \ \ \ | | |/ / | |/| | | | | | mnc-dev
| * | | Use previous pressure value if the current fusion data is zero.Michael Wright2015-05-122-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Synthesize events for pressure and button changes." into mnc-devMichael Wright2015-05-132-20/+41
|\ \ \ \ | |/ / /
| * | | Synthesize events for pressure and button changes.Michael Wright2015-05-122-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Fix PTS handling for buffer replacement" into mnc-devDan Stoza2015-05-1314-99/+98
|\ \ \ \
| * | | | Fix PTS handling for buffer replacementDan Stoza2015-05-1214-99/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Verify that the native handle was created" into mnc-devAdam Lesinski2015-05-131-0/+4
|\ \ \ \ \
| * | | | | Verify that the native handle was createdAdam Lesinski2015-05-121-0/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "libgui: Always allow allocation on connect" into mnc-devDan Stoza2015-05-121-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | libgui: Always allow allocation on connectDan Stoza2015-05-121-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Improve logging in SensorService dump output." into mnc-devAravind Akella2015-05-123-139/+279
|\ \ \ \ | |/ / / |/| | |
| * | | Improve logging in SensorService dump output.Aravind Akella2015-05-123-139/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension" into ↵Jesse Hall2015-05-122-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | mnc-dev
| * | | | libEGL: whitelist the EGL_KHR_create_context_no_error extensionJesse Hall2015-05-122-0/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | libgui: Hook up onFrameReplacedDan Stoza2015-05-115-22/+42
|/ / / | | | | | | | | | | | | | | | | | | This completes the plumbing from ConsumerListener::onFrameReplaced into SurfaceFlinger (and other consumers that may care). Change-Id: I376e78ace95d6748e8662e6b4d47c0dfa697a300
* | | Merge "Fix the arguments to memcpy." into mnc-devAravind Akella2015-05-091-1/+1
|\ \ \
| * | | Fix the arguments to memcpy.Aravind Akella2015-05-081-1/+1
| |/ / | | | | | | | | | Change-Id: Ieaee26f46f43a9d412537047566178985370198b
* | | Merge "SF: Apply pending transactions to new sidebands" into mnc-devDan Stoza2015-05-081-0/+4
|\ \ \
| * | | SF: Apply pending transactions to new sidebandsDan Stoza2015-05-051-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | Merge "surfaceflinger: Fix range check for getFormat" into mnc-devPat Tjin2015-05-071-1/+1
|\ \ \
| * | | surfaceflinger: Fix range check for getFormatAjay Dudani2015-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix potential buffer overflow error in getFormat with indices greater than MAX_HWC_DISPLAYS. Change-Id: I5e5b69d8d043e900f5e33ca9a62e94ae5f857b68
* | | | Fix broken NDK sensor manager API.Svet Ganov2015-05-072-0/+81
|/ / / | | | | | | | | | Change-Id: I21bb8b0dcfd3f1c812753a9fd77dea792e7155f2
* | | Added Voltage and Current regulator ftrace events to atraceAaron Schulman2015-05-071-0/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge "libgui: Clear frame number while freeing slot" into mnc-devDan Stoza2015-05-042-1/+4
|\ \
| * | libgui: Clear frame number while freeing slotDan Stoza2015-05-012-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | SensorServiceTest: Fix build, warnings.Sasha Levitskiy2015-05-021-4/+5
| | | | | | | | | | | | | | | Change-Id: I3ed5247d3eb6c43d185049cf9011c2ee01b5662e Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | Merge "Add body sensors app op - framework native" into mnc-devSvetoslav2015-05-0118-78/+195
|\ \ \
| * | | Add body sensors app op - framework nativeSvetoslav2015-05-0118-78/+195
| | | | | | | | | | | | | | | | Change-Id: I727a2bb1e28ae9158f2df9c74dd0aee977dfd47f
* | | | dumpstate: report per-partition MMC performanceMark Salyzyn2015-05-013-1/+141
| | | | | | | | | | | | | | | | | | | | | | | | (Cherry pick from commit 540e3de99fa1baa5eaf3eb3d49f4e98fd9f5bd91) Change-Id: If5cabe186d8377056effa1c0672a90e277cd7221
* | | | Merge "SurfaceFlinger: Fix PTS on stale buffers" into mnc-devDan Stoza2015-05-019-4/+100
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.1 at 2025-01-27 14:11:56 +0000