Amith Dsouza
4f21a4cc22
Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""
...
This reverts commit 6e1a2fea67
2015-07-01 10:22:22 -07:00
Narayan Kamath
22feef5d32
am 00078817: am 59a33a01: (-s ours) am dbc2d87a: Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"
...
* commit '000788178c411e2c6e5ee99f25cffe6662c5ee66':
Installd: Fix delete_code_cache() clearing the wrong cache dir
2015-07-01 13:49:21 +00:00
Narayan Kamath
000788178c
am 59a33a01: (-s ours) am dbc2d87a: Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"
...
* commit '59a33a012d64d21fb73cac527ef25db8a0478d23':
Installd: Fix delete_code_cache() clearing the wrong cache dir
2015-07-01 13:35:14 +00:00
Narayan Kamath
59a33a012d
am dbc2d87a: Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"
...
* commit 'dbc2d87a74987db84f6cb3cf1eed9ae7ca450ce7':
Installd: Fix delete_code_cache() clearing the wrong cache dir
2015-07-01 13:14:41 +00:00
Narayan Kamath
dbc2d87a74
Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"
2015-07-01 13:03:55 +00:00
Hao Li
1bcb35bf87
Installd: Fix delete_code_cache() clearing the wrong cache dir
...
Fix a typo in delete_code_cache() introduced by commit c03de09
2015-07-01 13:03:43 +00:00
Chad Brubaker
b4c460ccaf
am b5d6ec7c: am e59cb43e: Fix writeByteArray/writeInt32Array size on x64
...
* commit 'b5d6ec7cff06e6cbeeb238bea535c54a67e94d49':
Fix writeByteArray/writeInt32Array size on x64
2015-06-30 23:13:27 +00:00
Chad Brubaker
b5d6ec7cff
am e59cb43e: Fix writeByteArray/writeInt32Array size on x64
...
* commit 'e59cb43edad0eff28a81b18c3c4484442ff680dd':
Fix writeByteArray/writeInt32Array size on x64
2015-06-30 22:59:12 +00:00
Aravind Akella
841a5926fc
Enable sensor data injection mode through adb.
...
Change-Id: I415cf8ff0871fa74babaf9b879c68f210298b472
2015-06-30 14:59:58 -07:00
Chad Brubaker
e59cb43eda
Fix writeByteArray/writeInt32Array size on x64
...
writeByteArray writes the size using sizeof(size_t), however it is always
read using readInt32(). On devices where sizeof(size_t) != 4 this causes
extra bytes to be written.
BUG: 22204736
Change-Id: I8d4507b6b616857ef5827f1fe9da0907d09abf0e
2015-06-30 14:50:09 -07:00
Daichi Hirono
e197d815c4
Fix directory path of codecache.
...
Previously installd removed the normal cache directory when delete_code_cache is
called. It should delete the code cache directory.
BUG=21206499
Change-Id: I5774430e389e22805fa7984b4c83420c3677ca75
2015-06-30 13:02:51 -07:00
Dan Stoza
49b2e13629
am 6a25a287: am 806334aa: am 1998615f: Merge "sf: Initialize EventThread before creating HWC"
...
* commit '6a25a2872852f23058268adcec61600460fcdfb6':
sf: Initialize EventThread before creating HWC
2015-06-30 17:49:47 +00:00
Dan Stoza
6a25a28728
am 806334aa: am 1998615f: Merge "sf: Initialize EventThread before creating HWC"
...
* commit '806334aacd089d1c419ed77021a2b1bb4f7644ef':
sf: Initialize EventThread before creating HWC
2015-06-30 17:38:41 +00:00
Dan Stoza
806334aacd
am 1998615f: Merge "sf: Initialize EventThread before creating HWC"
...
* commit '1998615f8b5becc6d2bb309a4a1686fe24c71bbc':
sf: Initialize EventThread before creating HWC
2015-06-30 17:24:40 +00:00
Dan Stoza
1998615f8b
Merge "sf: Initialize EventThread before creating HWC"
2015-06-30 17:11:08 +00:00
Daichi Hirono
ad3d789378
am b5b21d18: am fe608c5e: Merge "Fix directory path of codecache." into mnc-dev
...
* commit 'b5b21d1837ba2039293feb283117e8ee441ec2a8':
Fix directory path of codecache.
2015-06-30 04:34:50 +00:00
Daichi Hirono
b5b21d1837
am fe608c5e: Merge "Fix directory path of codecache." into mnc-dev
...
* commit 'fe608c5e3c75714e4aa6c31e048f4a15e4951411':
Fix directory path of codecache.
2015-06-30 04:23:17 +00:00
Daichi Hirono
fe608c5e3c
Merge "Fix directory path of codecache." into mnc-dev
2015-06-30 04:01:53 +00:00
Michael Wright
2e099b2425
am fd0fdaf7: am 3643c88f: Merge "Send cancelation events to monitors when injection fails." into mnc-dev
...
* commit 'fd0fdaf73b1e8fbf643152f532f500be70f11a26':
Send cancelation events to monitors when injection fails.
2015-06-29 17:47:15 +00:00
Michael Wright
fd0fdaf73b
am 3643c88f: Merge "Send cancelation events to monitors when injection fails." into mnc-dev
...
* commit '3643c88f7b557e241d65c4857eaf49e28e7c03a2':
Send cancelation events to monitors when injection fails.
2015-06-29 17:40:25 +00:00
John Reck
d20914e981
am c28e8663: am 9c8efe6d: am dd749506: Merge "Fix async_stop"
...
* commit 'c28e8663dd4a14a7af7bd6a59cc0b490e31c778a':
Fix async_stop
2015-06-29 17:26:33 +00:00
Michael Wright
3643c88f7b
Merge "Send cancelation events to monitors when injection fails." into mnc-dev
2015-06-29 17:10:46 +00:00
John Reck
c28e8663dd
am 9c8efe6d: am dd749506: Merge "Fix async_stop"
...
* commit '9c8efe6dfddc9a4800283952caacdaf9b898c43d':
Fix async_stop
2015-06-29 14:41:27 +00:00
John Reck
9c8efe6dfd
am dd749506: Merge "Fix async_stop"
...
* commit 'dd7495068b9af549d2bb1e3c4f3d91a9a929d3f0':
Fix async_stop
2015-06-29 14:28:45 +00:00
John Reck
dd7495068b
Merge "Fix async_stop"
2015-06-29 14:17:43 +00:00
John Reck
4ba2b63bff
Fix async_stop
...
Change-Id: I68a258cf71cfcd999bbd568ab3c96255c11bec41
(cherry picked from commit 2c237ee1d5
2015-06-29 23:16:19 +09:00
The Android Automerger
343243652d
merge in mnc-release history after reset to mnc-dev
2015-06-27 01:03:16 -07:00
Dan Stoza
c08e7cb7b1
am 488986f4: am f413de05: Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
...
* commit '488986f4ad7a92b04fdfd761ae07785019d2a9d3':
libgui: Fix handling of rotated surface damage
2015-06-26 20:15:24 +00:00
Dan Stoza
488986f4ad
am f413de05: Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
...
* commit 'f413de05cfb9a1b84b73c8e6c306d4142130c5f7':
libgui: Fix handling of rotated surface damage
2015-06-26 20:01:09 +00:00
Dan Stoza
f413de05cf
Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
2015-06-26 19:37:29 +00:00
Lajos Molnar
84112b0999
am 3875698f: am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
...
* commit '3875698f8d47af86e024817889e4107392d20439':
omx: add OMX_IndexParamConsumerUsageBits
2015-06-26 15:21:01 +00:00
Anthony Hugh
c914ea6b48
am 2f105552: (-s ours) am 562d470d: am 209ea40e: (-s ours) am 9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
...
* commit '2f105552ef33a4cd4be199ac895041dc6ea628d4':
DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-26 15:21:00 +00:00
Adam Lesinski
c472a7d299
am 79439299: am 28381e45: am d2fb7a6e: am 8728c390: am 2c4f5fde: am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
...
* commit '794392999ecf1dae9b335aab3dd4b4627a6d07c7':
Verify that the native handle was created
2015-06-26 15:20:59 +00:00
Lajos Molnar
3875698f8d
am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
...
* commit 'e74f1557c7030a6c988d8e4cd940c933c4237ac8':
omx: add OMX_IndexParamConsumerUsageBits
2015-06-26 15:09:27 +00:00
Anthony Hugh
2f105552ef
am 562d470d: am 209ea40e: (-s ours) am 9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
...
* commit '562d470d2ca9ac159ab20fbac32bb0d8ca7b029e':
DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-26 15:09:07 +00:00
Adam Lesinski
794392999e
am 28381e45: am d2fb7a6e: am 8728c390: am 2c4f5fde: am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
...
* commit '28381e45de69a861d6b0d9e9cc9e8e1607a9a18f':
Verify that the native handle was created
2015-06-26 15:09:06 +00:00
Lajos Molnar
e74f1557c7
Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
2015-06-26 03:35:56 +00:00
Anthony Hugh
562d470d2c
am 209ea40e: (-s ours) am 9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
...
* commit '209ea40e8f3ccda405cd4e99c768b9b9b43e9dfa':
DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-26 02:22:50 +00:00
Adam Lesinski
28381e45de
am d2fb7a6e: am 8728c390: am 2c4f5fde: am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
...
* commit 'd2fb7a6e49f04182ba7b639c340414b1745137f2':
Verify that the native handle was created
2015-06-26 02:22:49 +00:00
Lajos Molnar
1017a1eaa7
omx: add OMX_IndexParamConsumerUsageBits
...
This is used by framework to query buffer consumers (e.g. video encoders)
about required usage bits.
Bug: 13222807
Change-Id: I508335c9d753c7a7224bb882f2228bd2f4144031
2015-06-25 16:58:52 -07:00
Dan Stoza
db4850c01f
libgui: Fix handling of rotated surface damage
...
Incoming surface damage was not aware that the EGL implementation was
rotating buffers in response to SurfaceFlinger's transform hint. This
didn't affect all cases because the effect was to apply a 90 degree
rotation instead of a 270 degree rotation. For full-screen updates,
things more or less worked, but in other cases this caused corruption.
This fixes that by correctly undoing the effect of rotated buffers on
the incoming surface damage, and then passing that damage down
untouched to HWC.
Bug: 22068334
Change-Id: I226ecfc7a91fe2e16edd2aa6d9149f0d26b529d6
2015-06-25 16:10:18 -07:00
Anthony Hugh
209ea40e8f
am 9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
...
* commit '9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f':
DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-25 01:27:44 +00:00
Anthony Hugh
9e415d719e
DO NOT MERGE: Introduce stem keycodes for Wear
...
Cherry-pick from master
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG: 21903503
Change-Id: I762b8c0bcf3780a1756f4c1b8bbf07a039ba7781
2015-06-24 14:42:17 -07:00
Aravind Akella
7f620a5a5e
Fix crash in SensorService. Ignore devices with no sensors.
...
Change-Id: I1491740baa6348f97c336b6883b11ad2ab93cf73
2015-06-24 14:39:04 -07:00
Christopher Tate
bb686c25b2
Disregard alleged binder entities beyond parcel bounds
...
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug 17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit 27182be9f2
2015-06-24 20:46:58 +00:00
Christopher Tate
2f340be345
Disregard alleged binder entities beyond parcel bounds
...
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug 17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit 27182be9f2
2015-06-24 20:46:38 +00:00
Christopher Tate
1b8a2f82fe
Disregard alleged binder entities beyond parcel bounds
...
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug 17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit 27182be9f2
2015-06-24 20:46:05 +00:00
Anthony Hugh
887b00dd28
Introduce stem keycodes for Wear
...
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG: 21903503
Change-Id: I60f87f027fa4d4b19933d96b4110019805b30895
2015-06-24 13:26:55 -07:00
Aravind Akella
12b26278df
am e6045537: am 7a1b5d5d: Merge "Fix crash in SensorService. Ignore devices with no sensors." into mnc-dev
...
* commit 'e6045537bbce4c4f98e6a1149187bbcdaff57bcd':
Fix crash in SensorService. Ignore devices with no sensors.
2015-06-24 16:08:13 +00:00
Aravind Akella
e6045537bb
am 7a1b5d5d: Merge "Fix crash in SensorService. Ignore devices with no sensors." into mnc-dev
...
* commit '7a1b5d5dec10f05ec29e7251ada440b47a34c6aa':
Fix crash in SensorService. Ignore devices with no sensors.
2015-06-24 15:56:29 +00:00
