Commit Graph

53105 Commits

Author SHA1 Message Date
The Android Automerger 16beb863ff merge in mnc-dr-release history after reset to mnc-dr-dev 2015-07-06 16:05:17 -07:00
Dan Stoza 0eb2d39866 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
2015-07-06 13:15:25 -07:00
Jesse Hall 56105b2f72 Merge "Implement a number of KHR EGL extensions" into mnc-dev 2015-07-06 16:09:35 +00:00
Christopher Tate 35f38e42c6 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
2015-07-02 03:28:47 +00:00
Christopher Tate 990c54485f 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
2015-07-02 02:57:06 +00:00
Christopher Tate 35851e2abb 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
2015-07-02 02:45:16 +00:00
Christopher Tate 38ff2b44ad am c1d8af50: am 3a9b9aec: am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit 'c1d8af50c314164c0e6760d364b47d16b8d423ee':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:33:03 +00:00
Christopher Tate 2b6109523d 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
2015-07-02 02:26:52 +00:00
Christopher Tate 8bd860c3dc am 110654ae: am 8e44d0a1: am 0804ed8e: am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '110654ae44e45b1afd5badd24ada96cb9018bed1':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:18:21 +00:00
Christopher Tate 356f7ed3af am 134fd91b: am 708b42e0: am eba7afcc: am 2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '134fd91bccde911bf9497f09841ec9922bbefec9':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:14:46 +00:00
Christopher Tate c1d8af50c3 am 3a9b9aec: am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '3a9b9aec7a0c04b74a278be5773fcfdaa2a04f4e':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:07:24 +00:00
Christopher Tate 110654ae44 am 8e44d0a1: am 0804ed8e: am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '8e44d0a173d1f0ec4075778791c88dc392f3981e':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:06:40 +00:00
Christopher Tate 8e44d0a173 am 0804ed8e: am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '0804ed8e604f2c4304fa7be3a84f429f770221bf':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:55:53 +00:00
Christopher Tate 134fd91bcc am 708b42e0: am eba7afcc: am 2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '708b42e0ee5ad97b8426a6245f73131ddfc59a33':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:55:43 +00:00
Christopher Tate 3a9b9aec7a am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit 'dc3d6af97d521678981c773ad9f4e1da088d7870':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:42:09 +00:00
Christopher Tate 708b42e0ee am eba7afcc: am 2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit 'eba7afcc14f55e7fd32db9254f2b186108e1c776':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:41:09 +00:00
Christopher Tate dc3d6af97d am bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit 'bb686c25b214edadd1830abd056db2d570d716ff':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:31:09 +00:00
Christopher Tate 0804ed8e60 am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '1b8a2f82fedffbc0b24c884def197db392b16576':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:29:18 +00:00
Christopher Tate eba7afcc14 am 2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '2f340be345612d9fc2ecb1ea2a4c9e147610a593':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:28:56 +00:00
Season Li 000d88f026 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
2015-07-01 16:52:44 -07:00
Amith Dsouza bbd4f23247 Merge "Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""" into mnc-dev 2015-07-01 17:45:05 +00:00
Aravind Akella 8719e3b631 Merge "Enable sensor data injection mode through adb." into mnc-dev 2015-07-01 17:40:08 +00:00
Amith Dsouza 4f21a4cc22 Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""
This reverts commit 6e1a2fea67.

Driver level issues fixed by an updated graphics driver.

Bug: 21266976
Change-Id: I93339fb6c6bab988f3550adb49ef8e70cda6473e
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, 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>
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
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
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