OSDN Git Service
Jeff Sharkey [Mon, 20 Jul 2015 23:57:26 +0000 (23:57 +0000)]
am
a2307aef: Only restorecon_data once for all users.
* commit '
a2307aefd06f1310660ef1d35ce01bcfc72c9633':
Only restorecon_data once for all users.
Jeff Sharkey [Mon, 20 Jul 2015 23:26:19 +0000 (16:26 -0700)]
Only restorecon_data once for all users.
restorecon_data already iterates across all found users internally,
so we don't need to call it for each UID moved. In fact, this was a
bug that caused data for the owner to be relabeled when moving apps
back to internal storage.
Bug:
21813384
Change-Id: I5ba76d4f30d129365864c8a25b665f344b99a6b4
Lajos Molnar [Fri, 17 Jul 2015 18:39:20 +0000 (18:39 +0000)]
am
5f920c1a: BufferQueueConsumer: signal onFrameReleased on dropped frames
* commit '
5f920c1a2cf12c0638c05fbddee8ff6c1193731c':
BufferQueueConsumer: signal onFrameReleased on dropped frames
Lajos Molnar [Mon, 13 Jul 2015 23:04:24 +0000 (16:04 -0700)]
BufferQueueConsumer: signal onFrameReleased on dropped frames
Bug:
22552826
Change-Id: I9bdfeb8c68f403301af90d4b494f0ae7166a767c
Andreas Gampe [Fri, 17 Jul 2015 01:45:54 +0000 (01:45 +0000)]
am
9cf822d1: am
25b2ed03: Merge "Installd: Add a swap override flag"
* commit '
9cf822d131634e49a0b7cd8f0e57ae6b620e32b4':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 01:31:13 +0000 (01:31 +0000)]
am
25b2ed03: Merge "Installd: Add a swap override flag"
* commit '
25b2ed03487b7c7b4e5e6897525a169ee32b1998':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 01:23:10 +0000 (01:23 +0000)]
Merge "Installd: Add a swap override flag"
Andreas Gampe [Fri, 17 Jul 2015 01:03:26 +0000 (01:03 +0000)]
am
c968c017: Installd: Add a swap override flag
* commit '
c968c0175e967e39e72f557b5e014b9575ba4727':
Installd: Add a swap override flag
Andreas Gampe [Thu, 16 Jul 2015 22:55:41 +0000 (15:55 -0700)]
Installd: Add a swap override flag
Add dalvik.vm.dex2oat-swap system property to override a default
decision.
Bug:
20658562
(cherry picked from commit
c968c0175e967e39e72f557b5e014b9575ba4727)
Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
Andreas Gampe [Thu, 16 Jul 2015 22:55:41 +0000 (15:55 -0700)]
Installd: Add a swap override flag
Add dalvik.vm.dex2oat-swap system property to override a default
decision.
Bug:
20658562
Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
Evgenii Stepanov [Wed, 15 Jul 2015 00:18:12 +0000 (00:18 +0000)]
am
3e7e4990: am
5e8dcf1c: Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
* commit '
3e7e4990132dba03431ed77cd89b1ad3493a8fea':
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Evgenii Stepanov [Wed, 15 Jul 2015 00:02:44 +0000 (00:02 +0000)]
am
5e8dcf1c: Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
* commit '
5e8dcf1c1fbd060f1bd2ba8d45bbc228bb310a7e':
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Evgenii Stepanov [Tue, 14 Jul 2015 23:47:59 +0000 (23:47 +0000)]
Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
Michael Wright [Tue, 14 Jul 2015 14:38:23 +0000 (14:38 +0000)]
am
fd549578: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit '
fd54957888a2fd692e1a8590d7e9e98e4da9ca4d':
Cancel touches as well as pointer gestures.
Michael Wright [Tue, 14 Jul 2015 14:22:36 +0000 (14:22 +0000)]
Merge "Cancel touches as well as pointer gestures." into mnc-dev
Aravind Akella [Mon, 13 Jul 2015 18:35:20 +0000 (18:35 +0000)]
am
4904821b: Merge "Rename wakelock held internally by SensorService." into mnc-dev
* commit '
4904821b212a3ee91f22a51295f86f6339cbcc8d':
Rename wakelock held internally by SensorService.
Aravind Akella [Mon, 13 Jul 2015 18:21:48 +0000 (18:21 +0000)]
Merge "Rename wakelock held internally by SensorService." into mnc-dev
Michael Wright [Mon, 22 Jun 2015 15:18:21 +0000 (16:18 +0100)]
Cancel touches as well as pointer gestures.
Bug:
19264992
Change-Id: If48e0953b972c9d69f516906adf7c6faf67e3eb8
Aravind Akella [Fri, 10 Jul 2015 18:24:28 +0000 (11:24 -0700)]
Rename wakelock held internally by SensorService.
Bug:
22076400
Change-Id: I62129549b0681f200f40da01f53140245309ed88
Qiwen Zhao [Fri, 10 Jul 2015 01:44:49 +0000 (01:44 +0000)]
am
982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to
570052f with history.
* commit '
982719b179aecc33aa6c258318fcbf6e4faa81d7':
Michael Wright [Fri, 10 Jul 2015 01:43:42 +0000 (01:43 +0000)]
am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit '
f37143d8a55afc6481d31de1c6f8e8db9578ef1d':
Cancel touches as well as pointer gestures.
Introduce stem keycodes for Wear
Mock out more inputflinger host functions
Remove unused ParcelFileDescriptor methods in parcel.
Basic implementation of input device properties.
Qiwen Zhao [Fri, 10 Jul 2015 00:39:23 +0000 (17:39 -0700)]
DO NOT MERGE ANYWHERE. reset back to
570052f with history.
Michael Wright [Thu, 9 Jul 2015 21:56:20 +0000 (21:56 +0000)]
Merge "Cancel touches as well as pointer gestures." into mnc-dev
Michael Wright [Mon, 22 Jun 2015 15:18:21 +0000 (16:18 +0100)]
Cancel touches as well as pointer gestures.
Bug:
19264992
Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011
Elliott Hughes [Thu, 9 Jul 2015 17:51:08 +0000 (17:51 +0000)]
am
9df25446: am
9bad590e: Merge "Binder on Windows? Unlikely."
* commit '
9df254460b2dfd3db1132affc9489d0be01def23':
Binder on Windows? Unlikely.
Elliott Hughes [Thu, 9 Jul 2015 17:29:47 +0000 (17:29 +0000)]
am
9bad590e: Merge "Binder on Windows? Unlikely."
* commit '
9bad590ef91c655fb9a0212e5a347aaa3e350bb0':
Binder on Windows? Unlikely.
Elliott Hughes [Thu, 9 Jul 2015 17:16:58 +0000 (17:16 +0000)]
Merge "Binder on Windows? Unlikely."
Elliott Hughes [Thu, 9 Jul 2015 17:04:34 +0000 (10:04 -0700)]
Binder on Windows? Unlikely.
Change-Id: I36c1bee4ed33b9b0d24109a6dbaefa0548dd5aa8
Evgenii Stepanov [Wed, 8 Jul 2015 22:49:52 +0000 (15:49 -0700)]
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Bug:
21785137
Change-Id: Iac56419a9ca776c5704bed44d3f0a1a1edd9d172
Jeff Sharkey [Tue, 7 Jul 2015 21:01:22 +0000 (21:01 +0000)]
am
570052f7: Merge "Split app move into separate copy/delete steps." into mnc-dev
* commit '
570052f7771586b61db27f88a38f8f1a3fac794a':
Split app move into separate copy/delete steps.
Jeff Sharkey [Tue, 7 Jul 2015 20:46:32 +0000 (20:46 +0000)]
Merge "Split app move into separate copy/delete steps." into mnc-dev
Jeff Sharkey [Tue, 7 Jul 2015 20:31:37 +0000 (13:31 -0700)]
Split app move into separate copy/delete steps.
App movement now has three distinct stages: copying, scanning, and
cleanup. Previously, a battery pull late in the move process would
end up with packages.xml pointing at the old location which had been
torn down. Now, we update packages.xml to point at the new location
as the "source of truth" before we start deleting the old location.
Bug:
21831336
Change-Id: I62b8916c673265c240e2574ea968cdce5a7a0074
Dan Stoza [Tue, 7 Jul 2015 18:07:21 +0000 (18:07 +0000)]
am
0eb2d398: SF: Ignore PTS more than one second in the future
* commit '
0eb2d398669bf11207c0fb22b11439250da0c8dc':
SF: Ignore PTS more than one second in the future
Dan Stoza [Mon, 6 Jul 2015 19:56:50 +0000 (12:56 -0700)]
SF: Ignore PTS more than one second in the future
Some of this logic already existed, but when we optimized
SurfaceFlinger to avoid unnecessary wake-ups, we didn't carry the logic
over into the new readiness test. shouldPresentNow now returns true if
the timestamp is more than a second in the future (since it's likely a
bogus timestamp and should be ignored).
Bug:
21932760
Change-Id: Ib50970a4eb621588c0b60766c8d8d1a8bddf853b
Jesse Hall [Mon, 6 Jul 2015 16:20:05 +0000 (16:20 +0000)]
am
56105b2f: Merge "Implement a number of KHR EGL extensions" into mnc-dev
* commit '
56105b2f72761dec62699db5d61570971fdf6580':
Implement a number of KHR EGL extensions
Jesse Hall [Mon, 6 Jul 2015 16:09:33 +0000 (16:09 +0000)]
Merge "Implement a number of KHR EGL extensions" into mnc-dev
Christopher Tate [Thu, 2 Jul 2015 03:52:35 +0000 (03:52 +0000)]
am
35f38e42: am
990c5448: am
35851e2a: am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
35f38e42c66c20d2bbb05f5942ee1019d3f695fa':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 03:28:47 +0000 (03:28 +0000)]
am
990c5448: am
35851e2a: am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
990c54485f361d587d09952e60ab5fb608d161dd':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:57:06 +0000 (02:57 +0000)]
am
35851e2a: am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
35851e2abbfe8f1d9c4cc7dc13a6e6e155b61664':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:51:34 +0000 (02:51 +0000)]
am
2b610952: am
8bd860c3: am
110654ae: am
8e44d0a1: am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
2b6109523d88775815d6fa089ef74cc5d2184685':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:45:16 +0000 (02:45 +0000)]
am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
38ff2b44ad7a64768cd1bb8793ec6c45e8d1e68e':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:39:25 +0000 (02:39 +0000)]
am
356f7ed3: am
134fd91b: am
708b42e0: am
eba7afcc: am
2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '
356f7ed3afe020da4f8d71c4f5e1abcda817d991':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:33:03 +0000 (02:33 +0000)]
am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
c1d8af50c314164c0e6760d364b47d16b8d423ee':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:26:52 +0000 (02:26 +0000)]
am
8bd860c3: am
110654ae: am
8e44d0a1: am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
8bd860c3dc2eaac10b6f55c9ec85cae4d172eb26':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:18:21 +0000 (02:18 +0000)]
am
110654ae: am
8e44d0a1: am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
110654ae44e45b1afd5badd24ada96cb9018bed1':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:14:46 +0000 (02:14 +0000)]
am
134fd91b: am
708b42e0: am
eba7afcc: am
2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '
134fd91bccde911bf9497f09841ec9922bbefec9':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:07:24 +0000 (02:07 +0000)]
am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
3a9b9aec7a0c04b74a278be5773fcfdaa2a04f4e':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:06:40 +0000 (02:06 +0000)]
am
8e44d0a1: am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
8e44d0a173d1f0ec4075778791c88dc392f3981e':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:55:53 +0000 (01:55 +0000)]
am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
0804ed8e604f2c4304fa7be3a84f429f770221bf':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:55:43 +0000 (01:55 +0000)]
am
708b42e0: am
eba7afcc: am
2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '
708b42e0ee5ad97b8426a6245f73131ddfc59a33':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:42:09 +0000 (01:42 +0000)]
am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
dc3d6af97d521678981c773ad9f4e1da088d7870':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:41:09 +0000 (01:41 +0000)]
am
eba7afcc: am
2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '
eba7afcc14f55e7fd32db9254f2b186108e1c776':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:31:09 +0000 (01:31 +0000)]
am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
bb686c25b214edadd1830abd056db2d570d716ff':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:29:18 +0000 (01:29 +0000)]
am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
1b8a2f82fedffbc0b24c884def197db392b16576':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:28:56 +0000 (01:28 +0000)]
am
2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '
2f340be345612d9fc2ecb1ea2a4c9e147610a593':
Disregard alleged binder entities beyond parcel bounds
Amith Dsouza [Thu, 2 Jul 2015 01:02:50 +0000 (01:02 +0000)]
am
bbd4f232: Merge "Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""" into mnc-dev
* commit '
bbd4f23247b3599bdda0149fcb68f311900ecf4f':
Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""
Aravind Akella [Thu, 2 Jul 2015 01:02:49 +0000 (01:02 +0000)]
am
8719e3b6: Merge "Enable sensor data injection mode through adb." into mnc-dev
* commit '
8719e3b6310f97a736620395024c858ca8ec7e0c':
Enable sensor data injection mode through adb.
Season Li [Wed, 1 Jul 2015 18:39:40 +0000 (11:39 -0700)]
Implement a number of KHR EGL extensions
Add following KHR EGL extensions:
EGL_KHR_gl_texture_3D_image
EGL_KHR_config_attribs
EGL_KHR_surfaceless_context
EGL_KHR_stream
EGL_KHR_stream_fifo
EGL_KHR_stream_producer_eglsurface
EGL_KHR_stream_consumer_gltexture
EGL_KHR_stream_cross_process_fd
Change-Id: Ie7a35b5e3761e343cb71cf446cba77f67f604bdf
Amith Dsouza [Wed, 1 Jul 2015 17:44:57 +0000 (17:44 +0000)]
Merge "Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""" into mnc-dev
Aravind Akella [Wed, 1 Jul 2015 17:40:07 +0000 (17:40 +0000)]
Merge "Enable sensor data injection mode through adb." into mnc-dev
Amith Dsouza [Wed, 1 Jul 2015 05:54:16 +0000 (22:54 -0700)]
Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""
This reverts commit
6e1a2fea67006b58e83ebbcc72f7b12f18c49d15.
Driver level issues fixed by an updated graphics driver.
Bug:
21266976
Change-Id: I93339fb6c6bab988f3550adb49ef8e70cda6473e
Narayan Kamath [Wed, 1 Jul 2015 13:49:21 +0000 (13:49 +0000)]
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
Narayan Kamath [Wed, 1 Jul 2015 13:35:14 +0000 (13:35 +0000)]
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
Narayan Kamath [Wed, 1 Jul 2015 13:14:41 +0000 (13:14 +0000)]
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
Narayan Kamath [Wed, 1 Jul 2015 13:03:55 +0000 (13:03 +0000)]
Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"
Hao Li [Thu, 25 Jun 2015 02:31:56 +0000 (14:31 +1200)]
Installd: Fix delete_code_cache() clearing the wrong cache dir
Fix a typo in delete_code_cache() introduced by commit
c03de09, which
causes the function to empty /data/data/<package_name>/cache/ rather
than /data/data/<package_name>/code_cache/.
The following CTS test case should now pass:
com.android.cts.appsecurity.SplitTests#testClearCodeCache
Change-Id: I2d9452d70ed39b3ea29ad65fb35e788c2fef5100
Signed-off-by: Hao Li <hao.i.li@intel.com>
Signed-off-by: Yu Ning <yu.ning@intel.com>
Chad Brubaker [Tue, 30 Jun 2015 23:13:27 +0000 (23:13 +0000)]
am
b5d6ec7c: am
e59cb43e: Fix writeByteArray/writeInt32Array size on x64
* commit '
b5d6ec7cff06e6cbeeb238bea535c54a67e94d49':
Fix writeByteArray/writeInt32Array size on x64
Chad Brubaker [Tue, 30 Jun 2015 22:59:12 +0000 (22:59 +0000)]
am
e59cb43e: Fix writeByteArray/writeInt32Array size on x64
* commit '
e59cb43edad0eff28a81b18c3c4484442ff680dd':
Fix writeByteArray/writeInt32Array size on x64
Aravind Akella [Mon, 29 Jun 2015 19:37:48 +0000 (12:37 -0700)]
Enable sensor data injection mode through adb.
Change-Id: I415cf8ff0871fa74babaf9b879c68f210298b472
Chad Brubaker [Tue, 30 Jun 2015 21:03:55 +0000 (14:03 -0700)]
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
Dan Stoza [Tue, 30 Jun 2015 17:49:47 +0000 (17:49 +0000)]
am
6a25a287: am
806334aa: am
1998615f: Merge "sf: Initialize EventThread before creating HWC"
* commit '
6a25a2872852f23058268adcec61600460fcdfb6':
sf: Initialize EventThread before creating HWC
Dan Stoza [Tue, 30 Jun 2015 17:38:41 +0000 (17:38 +0000)]
am
806334aa: am
1998615f: Merge "sf: Initialize EventThread before creating HWC"
* commit '
806334aacd089d1c419ed77021a2b1bb4f7644ef':
sf: Initialize EventThread before creating HWC
Dan Stoza [Tue, 30 Jun 2015 17:24:40 +0000 (17:24 +0000)]
am
1998615f: Merge "sf: Initialize EventThread before creating HWC"
* commit '
1998615f8b5becc6d2bb309a4a1686fe24c71bbc':
sf: Initialize EventThread before creating HWC
Dan Stoza [Tue, 30 Jun 2015 17:11:08 +0000 (17:11 +0000)]
Merge "sf: Initialize EventThread before creating HWC"
Daichi Hirono [Tue, 30 Jun 2015 04:34:50 +0000 (04:34 +0000)]
am
b5b21d18: am
fe608c5e: Merge "Fix directory path of codecache." into mnc-dev
* commit '
b5b21d1837ba2039293feb283117e8ee441ec2a8':
Fix directory path of codecache.
Daichi Hirono [Tue, 30 Jun 2015 04:23:17 +0000 (04:23 +0000)]
am
fe608c5e: Merge "Fix directory path of codecache." into mnc-dev
* commit '
fe608c5e3c75714e4aa6c31e048f4a15e4951411':
Fix directory path of codecache.
Daichi Hirono [Tue, 30 Jun 2015 04:01:51 +0000 (04:01 +0000)]
Merge "Fix directory path of codecache." into mnc-dev
Michael Wright [Mon, 29 Jun 2015 17:47:15 +0000 (17:47 +0000)]
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.
Michael Wright [Mon, 29 Jun 2015 17:40:25 +0000 (17:40 +0000)]
am
3643c88f: Merge "Send cancelation events to monitors when injection fails." into mnc-dev
* commit '
3643c88f7b557e241d65c4857eaf49e28e7c03a2':
Send cancelation events to monitors when injection fails.
John Reck [Mon, 29 Jun 2015 17:26:33 +0000 (17:26 +0000)]
am
c28e8663: am
9c8efe6d: am
dd749506: Merge "Fix async_stop"
* commit '
c28e8663dd4a14a7af7bd6a59cc0b490e31c778a':
Fix async_stop
Michael Wright [Mon, 29 Jun 2015 17:10:45 +0000 (17:10 +0000)]
Merge "Send cancelation events to monitors when injection fails." into mnc-dev
John Reck [Mon, 29 Jun 2015 14:41:27 +0000 (14:41 +0000)]
am
9c8efe6d: am
dd749506: Merge "Fix async_stop"
* commit '
9c8efe6dfddc9a4800283952caacdaf9b898c43d':
Fix async_stop
John Reck [Mon, 29 Jun 2015 14:28:45 +0000 (14:28 +0000)]
am
dd749506: Merge "Fix async_stop"
* commit '
dd7495068b9af549d2bb1e3c4f3d91a9a929d3f0':
Fix async_stop
John Reck [Mon, 29 Jun 2015 14:17:43 +0000 (14:17 +0000)]
Merge "Fix async_stop"
John Reck [Fri, 15 May 2015 17:00:34 +0000 (10:00 -0700)]
Fix async_stop
Change-Id: I68a258cf71cfcd999bbd568ab3c96255c11bec41
(cherry picked from commit
2c237ee1d5961b9d11618e0c5a97b3bb7fb694b2)
Dan Stoza [Fri, 26 Jun 2015 20:15:24 +0000 (20:15 +0000)]
am
488986f4: am
f413de05: Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
* commit '
488986f4ad7a92b04fdfd761ae07785019d2a9d3':
libgui: Fix handling of rotated surface damage
Dan Stoza [Fri, 26 Jun 2015 20:01:09 +0000 (20:01 +0000)]
am
f413de05: Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
* commit '
f413de05cfb9a1b84b73c8e6c306d4142130c5f7':
libgui: Fix handling of rotated surface damage
Dan Stoza [Fri, 26 Jun 2015 19:37:23 +0000 (19:37 +0000)]
Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
Lajos Molnar [Fri, 26 Jun 2015 15:21:01 +0000 (15:21 +0000)]
am
3875698f: am
e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
* commit '
3875698f8d47af86e024817889e4107392d20439':
omx: add OMX_IndexParamConsumerUsageBits
Anthony Hugh [Fri, 26 Jun 2015 15:21:00 +0000 (15:21 +0000)]
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
Adam Lesinski [Fri, 26 Jun 2015 15:20:59 +0000 (15:20 +0000)]
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
Lajos Molnar [Fri, 26 Jun 2015 15:09:27 +0000 (15:09 +0000)]
am
e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
* commit '
e74f1557c7030a6c988d8e4cd940c933c4237ac8':
omx: add OMX_IndexParamConsumerUsageBits
Anthony Hugh [Fri, 26 Jun 2015 15:09:07 +0000 (15:09 +0000)]
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
Adam Lesinski [Fri, 26 Jun 2015 15:09:06 +0000 (15:09 +0000)]
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
Lajos Molnar [Fri, 26 Jun 2015 03:35:55 +0000 (03:35 +0000)]
Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
Anthony Hugh [Fri, 26 Jun 2015 02:22:50 +0000 (02:22 +0000)]
am
209ea40e: (-s ours) am
9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
209ea40e8f3ccda405cd4e99c768b9b9b43e9dfa':
DO NOT MERGE: Introduce stem keycodes for Wear
Adam Lesinski [Fri, 26 Jun 2015 02:22:49 +0000 (02:22 +0000)]
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
Lajos Molnar [Thu, 25 Jun 2015 23:57:17 +0000 (16:57 -0700)]
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
Dan Stoza [Thu, 25 Jun 2015 23:10:18 +0000 (16:10 -0700)]
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
Anthony Hugh [Thu, 25 Jun 2015 01:27:44 +0000 (01:27 +0000)]
am
9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f':
DO NOT MERGE: Introduce stem keycodes for Wear