Merge commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22'
* commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22':
fix the sim build. disables the tests for now.
Merge commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd'
* commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd':
Define the URI path, columns and constants for shortcut validation.
Merge commit '3fd7e13960c2763225c5c8bc187bd15da04820dd'
* commit '3fd7e13960c2763225c5c8bc187bd15da04820dd':
Add new binder methods to camera client to support generic callbacks
Merge commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5'
* commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5':
* update density correctly when the configuration is changed.
This was always a documented restriction, but was not enforced by the runtime until now.
Until now, if you passed in some other kind of buffer, it would sometimes work, and
sometimes fail. The failures happened when the Java VM moved the buffer data while
OpenGL was still holding a pointer to it.
Now we throw an exception rather than leaving the system in a potentially bad state.
* changes:
Add new binder methods to camera client to support generic callbacks This is the first step in a multi-step change to move from the old specific callbacks to a generic callback. This will allow future flexibility in the interface without requiring binder rewrites. Bug 1837832
* changes:
* update density correctly when the configuration is changed. * Turns private sLcdDensity to public DEVICE_DENSITY to use it in ActivityThread
Merge commit 'fedf566b9e00f18588fc104caafd047af069844a'
* commit 'fedf566b9e00f18588fc104caafd047af069844a':
AI 148484: (1) Pass recognizer intent to RecognitionService when starting to listen.
This is the first step in a multi-step change to move from the old
specific callbacks to a generic callback. This will allow future
flexibility in the interface without requiring binder rewrites.
Bug 1837832
Merge commit 'e87bf13924199225d2751ae7b4d0451954ee3711'
* commit 'e87bf13924199225d2751ae7b4d0451954ee3711':
AI 148461: Changes to support ADT 0.9.1. Update ADT version id, move older ADT versions to a separate table.
Merge commit '1f8059f19f3345042121a55481d7f01dacc8d29e' into donut
* commit '1f8059f19f3345042121a55481d7f01dacc8d29e':
AI 148461: Changes to support ADT 0.9.1. Update ADT version id, move older ADT versions to a separate table.
Merge commit 'f096acd37994e47792552c2e53a6246dc8afb0d3' into donut
* commit 'f096acd37994e47792552c2e53a6246dc8afb0d3':
AI 148460: Misc changes for dev site.
Remove include of an internal agl header file. We should not depend on any implementation details
of our software renderer, since they may not be correct if another renderer is used.
Fix glGet number-of-elements logic for GL_FOG_COLOR GL_LIGHT_MODEL_AMBIENT,
and GL_COMPRESSED_TEXTURE_FORMATS.
Merge commit '0efb0868841cc1c2b5a669b39880d931f54f705a'
* commit '0efb0868841cc1c2b5a669b39880d931f54f705a':
Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest
