Commit Graph

52622 Commits

Author SHA1 Message Date
The Android Automerger
83265b58b8 merge in mnc-dr-release history after reset to mnc-dr-dev 2015-07-08 01:02:17 -07:00
Jeff Sharkey
570052f777 Merge "Split app move into separate copy/delete steps." into mnc-dev 2015-07-07 20:46:34 +00:00
Jeff Sharkey
31f08986f8 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
2015-07-07 13:31:53 -07:00
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
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
fe608c5e3c Merge "Fix directory path of codecache." into mnc-dev 2015-06-30 04:01:53 +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
Dan Stoza
f413de05cf Merge "libgui: Fix handling of rotated surface damage" into mnc-dev 2015-06-26 19:37:29 +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
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
Aravind Akella
7a1b5d5dec Merge "Fix crash in SensorService. Ignore devices with no sensors." into mnc-dev 2015-06-24 15:34:59 +00:00
Aravind Akella
ee155cadb2 Fix crash in SensorService. Ignore devices with no sensors.
Change-Id: I1491740baa6348f97c336b6883b11ad2ab93cf73
2015-06-24 08:32:56 -07:00
Daichi Hirono
a2ccb9e43d 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-24 15:57:06 +09:00
Dan Stoza
0638a4fac7 Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev 2015-06-23 15:44:10 +00:00
Michael Wright
71997c1a92 Merge "Add new AINPUT_SOURCE_BLUETOOTH_STYLUS" into mnc-dev 2015-06-23 12:49:30 +00:00
Michael Wright
18c773307a Merge "Add method to set action button on MotionEvent" into mnc-dev 2015-06-23 12:49:00 +00:00
Aravind Akella
9418846431 Merge "More information in sensor bugreports." into mnc-dev 2015-06-22 18:17:38 +00:00
David Srbecky
528c8ddc60 Rename --include-cfi to --generate-debug-info.
This follows a change in dex2oat.

(cherry picked from commit 741a6ff2e2)

Bug: 21924613
Change-Id: I6b2df1668fdd09d82cfe86e6e51360b954b6c8a9
2015-06-19 02:32:41 +01:00
Andreas Gampe
3822b8b79c Installd: Add debug.gencfi to run_dex2oat
Add the debug.gencfi system property that forces generation of
CFI data.

(cherry picked from commit 816243d470)

Bug: 21924613
Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
2015-06-19 02:31:33 +01:00