OSDN Git Service
Jean-Baptiste Queru [Tue, 16 Jul 2013 20:11:18 +0000 (20:11 +0000)]
Merge "Tweaks for forward compatibility" into stage-aosp-master
Jean-Baptiste Queru [Tue, 16 Jul 2013 16:38:03 +0000 (09:38 -0700)]
Tweaks for forward compatibility
Change-Id: Id6a96521b3fd5bd2a034fe89cfa4d3a179a66328
The Android Open Source Project [Mon, 15 Jul 2013 16:33:20 +0000 (09:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ia73ebcebfb83a21442a31dc7280763484e47534c
The Android Automerger [Mon, 15 Jul 2013 15:19:12 +0000 (08:19 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Mathias Agopian [Fri, 12 Jul 2013 20:17:05 +0000 (13:17 -0700)]
am
ac9a96da: fix a dead-lock in sensorservice
* commit '
ac9a96da65f6eae4513654adaad8a457d1c1575c':
fix a dead-lock in sensorservice
Mathias Agopian [Fri, 12 Jul 2013 09:01:16 +0000 (02:01 -0700)]
fix a dead-lock in sensorservice
sensorservice would deadlock if for some reason
a sensor failed to enable.
simplifed the code a bit, and made it behave a little
closer to mr1.1 -- I couldn't convince myself that
some changes in how locks were used were correct.
Bug:
9794362
Change-Id: I6110f5dbb67e543f1c71d127de2299232badb36a
The Android Open Source Project [Wed, 10 Jul 2013 15:35:04 +0000 (08:35 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I5445989fd1dd6e851d3efe060cf3fc4ae1d104fb
The Android Automerger [Wed, 10 Jul 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Wed, 10 Jul 2013 00:13:32 +0000 (17:13 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id26b917342f6ee70c32c2713d07944dae1c10e01
Jesse Hall [Thu, 4 Jul 2013 19:08:16 +0000 (12:08 -0700)]
Find non-extension GLES wrappers in eglGetProcAddress
This allows apps to find OpenGL ES 3.0 functions using
eglGetProcAddress() instead of dlopen/dlsym.
Bug:
9681677
Change-Id: I7ce6e1636bc47d6b0bf20a4e46bd67235714d129
Elliott Hughes [Tue, 9 Jul 2013 22:35:33 +0000 (15:35 -0700)]
am
9da67a94: am
67481607: Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor.""
* commit '
9da67a9427f695128b5da61c8f987fd9198a5e05':
Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Tue, 9 Jul 2013 22:30:48 +0000 (15:30 -0700)]
am
67481607: Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor.""
* commit '
674816078588d0951c3c9bdaf26ecc9e9b3f2e0a':
Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Tue, 9 Jul 2013 22:27:16 +0000 (22:27 +0000)]
Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor.""
Elliott Hughes [Tue, 9 Jul 2013 22:15:42 +0000 (22:15 +0000)]
Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
This reverts commit
ddd286301b466b5cd10cfcdc0a5ee5729ef2e385, because the third-party library in question has now been fixed.
Change-Id: Ic195a913f90b36268ed9d6e60be520decb4e198d
Jesse Hall [Tue, 9 Jul 2013 17:54:20 +0000 (10:54 -0700)]
am
c07b5206: Find non-extension GLES wrappers in eglGetProcAddress
* commit '
c07b52060acd627c8510c1a9151e0753fce76330':
Find non-extension GLES wrappers in eglGetProcAddress
Jesse Hall [Thu, 4 Jul 2013 19:08:16 +0000 (12:08 -0700)]
Find non-extension GLES wrappers in eglGetProcAddress
This allows apps to find OpenGL ES 3.0 functions using
eglGetProcAddress() instead of dlopen/dlsym.
Bug:
9681677
Change-Id: I7ce6e1636bc47d6b0bf20a4e46bd67235714d129
Jean-Baptiste Queru [Tue, 2 Jul 2013 19:33:15 +0000 (12:33 -0700)]
am
f4f2bd21: Tweak for forward compatibility
* commit '
f4f2bd21d5b57f1598172ddbc44817c10785bdb3':
Tweak for forward compatibility
Jean-Baptiste Queru [Tue, 2 Jul 2013 17:46:02 +0000 (10:46 -0700)]
Tweak for forward compatibility
Change-Id: I6be78b607789c469f4ffad849a493d78e2539450
Jean-Baptiste Queru [Tue, 25 Jun 2013 22:37:44 +0000 (15:37 -0700)]
am
3c0425cd: am
0ecf0b8d: Merge "Additional parameter validation for EGL functions"
* commit '
3c0425cd95a7918d1dbfecf32aef3b238bf236a5':
Additional parameter validation for EGL functions
Jean-Baptiste Queru [Tue, 25 Jun 2013 22:35:05 +0000 (15:35 -0700)]
am
0ecf0b8d: Merge "Additional parameter validation for EGL functions"
* commit '
0ecf0b8db74682222bf095a235e28edefff871a5':
Additional parameter validation for EGL functions
Jean-Baptiste Queru [Tue, 25 Jun 2013 22:31:13 +0000 (22:31 +0000)]
Merge "Additional parameter validation for EGL functions"
The Android Open Source Project [Thu, 13 Jun 2013 01:04:25 +0000 (18:04 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ib28265f84583e4c1c8860f359145f38737817e99
Jeff Tinker [Tue, 11 Jun 2013 18:30:21 +0000 (11:30 -0700)]
Prevent IPCThreadState::joinThreadPool from spinning on unexpected error
Adds logging to help determine what is happening to the /dev/binder
fd and dump the process state when it happens.
bug:
8912673
Change-Id: I2aa0c66fc499e91e0bf9ee4ae20404bec35adc82
The Android Open Source Project [Wed, 12 Jun 2013 14:23:36 +0000 (07:23 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I02e004028811a3efad8c010ed19e216bb87814d7
The Android Automerger [Wed, 12 Jun 2013 12:56:00 +0000 (05:56 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jeff Tinker [Wed, 12 Jun 2013 03:09:27 +0000 (20:09 -0700)]
am
ef07386e: Prevent IPCThreadState::joinThreadPool from spinning on unexpected error
* commit '
ef07386e2fca73680214ececc3c9c0ecbb0f6d88':
Prevent IPCThreadState::joinThreadPool from spinning on unexpected error
Jeff Tinker [Tue, 11 Jun 2013 18:30:21 +0000 (11:30 -0700)]
Prevent IPCThreadState::joinThreadPool from spinning on unexpected error
Adds logging to help determine what is happening to the /dev/binder
fd and dump the process state when it happens.
bug:
8912673
Change-Id: I2aa0c66fc499e91e0bf9ee4ae20404bec35adc82
Jeff Brown [Thu, 30 May 2013 02:01:17 +0000 (19:01 -0700)]
am
86b2ecdd: Merge "fix mem leak on error handling"
* commit '
86b2ecdd311fca2e1e4a3504bf96bb23c5630492':
fix mem leak on error handling
Jeff Brown [Thu, 30 May 2013 01:58:45 +0000 (01:58 +0000)]
Merge "fix mem leak on error handling"
Andrew Hsieh [Thu, 30 May 2013 01:33:33 +0000 (18:33 -0700)]
am
1c45dc66: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
* commit '
1c45dc66c77f0ddb246a55d780206a183740ff7f':
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
Andrew Hsieh [Thu, 30 May 2013 01:30:48 +0000 (01:30 +0000)]
Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
Hyejin Kim [Sat, 9 Mar 2013 02:28:54 +0000 (11:28 +0900)]
fix mem leak on error handling
Change-Id: I40d8e371c46184aa701fa676246201a9d8f6e27d
jp abgrall [Tue, 28 May 2013 22:46:14 +0000 (15:46 -0700)]
am
74bd799e: Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes"
* commit '
74bd799ec20d2420459fa382533b1cc39ca9a54c':
Exit dumpstate on SIGPIPE to avoid cascading child crashes
Jeff Brown [Tue, 28 May 2013 22:46:03 +0000 (15:46 -0700)]
am
135e4dbd: Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW"
* commit '
135e4dbd65d49730fbd6f830de7b303e01d20d5f':
utils: Allow non android namespaces to use ALOGD_IF_SLOW
jp abgrall [Tue, 28 May 2013 21:18:59 +0000 (21:18 +0000)]
Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes"
Jeff Brown [Tue, 28 May 2013 20:20:14 +0000 (20:20 +0000)]
Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW"
John Michelau [Mon, 6 May 2013 21:42:02 +0000 (16:42 -0500)]
Exit dumpstate on SIGPIPE to avoid cascading child crashes
When dumpstate ignores SIGPIPE it can lead to a cascade of tombstones /
coredumps since many of its children don't handle or ignore it. It's
best to just exit dumpstate once the pipe is broken.
Change-Id: Ic0c57ecf4171f0c0a07837e51c41cb1876e1350c
Andrew Hsieh [Mon, 27 May 2013 04:26:04 +0000 (12:26 +0800)]
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
See b.android.com/55873
Change-Id: I92c549e1a595662d4df8fa0e47675ccb2b8814fd
The Android Open Source Project [Mon, 20 May 2013 15:20:26 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I400727c668eff57b5760595787d21dd021464587
The Android Automerger [Sun, 19 May 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Fri, 17 May 2013 20:53:31 +0000 (13:53 -0700)]
am
23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
* commit '
23dacde4b624921df4f2c9646d20ca7acae357b6':
[DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
Mathias Agopian [Thu, 16 May 2013 02:14:52 +0000 (19:14 -0700)]
[DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
because surfaceflinger handles screenshot in a different
thread from the binder thread that requested it and because
the IGraphicBufferProducer is a synchronous interface
calling back into the system server; it is possible for
the latter to run out of binder threads (b/c it holds
a lock while calling into SF).
The solution is to make sure all calls on IGraphicBufferProducer
happen on the incoming binder thread. We achieve this by creating
a IGBP wrapper which is given to the screenshot code.
Bug:
8734824
Change-Id: Ife2441c7322e51ecfb20e0df03dacf6bce49578e
Mathias Agopian [Fri, 17 May 2013 17:16:51 +0000 (10:16 -0700)]
am
ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer
* commit '
ea74d3b78d607cde17790a7bb83e6f68ffd34cfd':
make the warning timout of Fence::waitForever() implicit and longer
Mathias Agopian [Fri, 17 May 2013 01:03:22 +0000 (18:03 -0700)]
make the warning timout of Fence::waitForever() implicit and longer
- timeout is now 3 seconds instead of 1
- simplifies the API a bit
- allows us to change/tweak this timeout globaly
Bug:
8988871
Change-Id: I8d3c6ec43a372f602fb3f29856710339f86c0ec9
The Android Open Source Project [Thu, 16 May 2013 12:43:41 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic457c583534afce9b1697b3b34221a729e2bc5b2
Jesse Hall [Tue, 14 May 2013 06:28:45 +0000 (23:28 -0700)]
am
e8fed71d: Merge "Abort surface composition if hw surface is invalid"
* commit '
e8fed71da2d3e03ef933d308520bab5b860f05aa':
Abort surface composition if hw surface is invalid
Jesse Hall [Tue, 14 May 2013 00:24:28 +0000 (00:24 +0000)]
Merge "Abort surface composition if hw surface is invalid"
Michael Chock [Mon, 4 Mar 2013 23:15:46 +0000 (15:15 -0800)]
Abort surface composition if hw surface is invalid
If an invalid display device is detected during surface composition
(e.g., a simulated secondary display is removed), abort the
composition.
Change-Id: Ia6afb2e287882d8ae0614eb25463d3f85b687adf
Jesse Hall [Mon, 13 May 2013 20:05:36 +0000 (13:05 -0700)]
am
f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"
* commit '
f0dcff89acb998179757ca66b5c6a2c585a980e9':
gl_code.cpp: Remove a DOS style newline
Jesse Hall [Mon, 13 May 2013 18:53:10 +0000 (18:53 +0000)]
Merge "gl_code.cpp: Remove a DOS style newline"
The Android Automerger [Mon, 13 May 2013 12:55:40 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Thu, 9 May 2013 17:15:17 +0000 (10:15 -0700)]
am
f743e3db: Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
* commit '
f743e3db27dd639421913ee5e99d7a13ccc236ea':
Add support for HAL_PIXEL_FORMAT_YCbCr_420_888
Eino-Ville Talvala [Thu, 9 May 2013 17:13:22 +0000 (17:13 +0000)]
Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
The Android Automerger [Thu, 9 May 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Wed, 8 May 2013 20:57:56 +0000 (13:57 -0700)]
am
64f3b2fd: Merge "Remove experimental HWC virtual display support" into jb-mr2-dev
* commit '
64f3b2fd1ea9d30df6fd04ecdb086e540465bc18':
Remove experimental HWC virtual display support
Jesse Hall [Wed, 8 May 2013 20:53:42 +0000 (20:53 +0000)]
Merge "Remove experimental HWC virtual display support" into jb-mr2-dev
The Android Automerger [Wed, 8 May 2013 12:55:32 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jamie Gennis [Wed, 8 May 2013 01:23:18 +0000 (18:23 -0700)]
am
db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev
* commit '
db733579a4c64eddd7dadb4ac15f54658ccfc0fb':
atrace: add the 'dalvik' trace category
Jamie Gennis [Wed, 8 May 2013 01:21:17 +0000 (01:21 +0000)]
Merge "atrace: add the 'dalvik' trace category" into jb-mr2-dev
Jeff Tinker [Wed, 8 May 2013 00:20:56 +0000 (17:20 -0700)]
am
b84d1cad: Correct native API documentation related to MediaDrm offline use case
* commit '
b84d1cad1d481f75aa03d55ac07e4ff58dbfb84a':
Correct native API documentation related to MediaDrm offline use case
Jamie Gennis [Tue, 7 May 2013 22:20:39 +0000 (15:20 -0700)]
atrace: add the 'dalvik' trace category
Bug:
8856374
Change-Id: Ie7759328333d21d8123ce9d4f1a177cae5ede51e
Jeff Tinker [Tue, 7 May 2013 21:07:10 +0000 (14:07 -0700)]
Correct native API documentation related to MediaDrm offline use case
These doc updates were made previously to the java API but some
did not make it into the native API.
Change-Id: I9b7bfcd77bc593685254baca1c148deb7e1f91c7
related-to-bug:
8621588
Jesse Hall [Tue, 7 May 2013 18:58:47 +0000 (11:58 -0700)]
Remove experimental HWC virtual display support
Bug:
8384764
Change-Id: I97b52ed83ad85466bd91cb9291308994048568a1
The Android Automerger [Tue, 7 May 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Sun, 5 May 2013 01:07:43 +0000 (18:07 -0700)]
Add support for HAL_PIXEL_FORMAT_YCbCr_420_888
- Add fields to CpuConsumer::LockedBuffer for new information
- New lock methods for GraphicBuffer and GraphicBufferMapper for
the format
Bug:
8734880
Change-Id: If31f82c62d64b6942cf4cc6e5715585c03273f12
Dianne Hackborn [Mon, 6 May 2013 22:21:02 +0000 (15:21 -0700)]
am
223b953c: Add Dalvik heap definition for 7" xhdpi devices.
* commit '
223b953cf748d8197cba26545172db9dcaeea2b4':
Add Dalvik heap definition for 7" xhdpi devices.
Dianne Hackborn [Mon, 6 May 2013 22:06:20 +0000 (15:06 -0700)]
Add Dalvik heap definition for 7" xhdpi devices.
Change-Id: I6a8e406ee98d3061d498bb2fbd1b97aa9e79b4b5
Marco Nelissen [Mon, 6 May 2013 18:11:38 +0000 (11:11 -0700)]
am
3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev
* commit '
3d3cc6e15ea6398105dc59d3135df3e64d5cf34e':
Report actual disk space used
The Android Automerger [Mon, 6 May 2013 12:55:30 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Marco Nelissen [Sun, 5 May 2013 01:17:48 +0000 (01:17 +0000)]
Merge "Report actual disk space used" into jb-mr2-dev
Dianne Hackborn [Thu, 2 May 2013 22:15:17 +0000 (15:15 -0700)]
am
4fc27d79: Merge "Fix issue #
8768456: Settings > App Info under reports..." into jb-mr2-dev
* commit '
4fc27d79c29646b08ff059abc19cc4a7bccaa316':
Fix issue #
8768456: Settings > App Info under reports...
Dianne Hackborn [Thu, 2 May 2013 22:11:17 +0000 (22:11 +0000)]
Merge "Fix issue #
8768456: Settings > App Info under reports..." into jb-mr2-dev
Jesse Hall [Thu, 2 May 2013 20:48:00 +0000 (13:48 -0700)]
am
c8639351: Generate new EGLExt class
* commit '
c86393510c8747519fe34e5aa38ce5218593c19c':
Generate new EGLExt class
Jesse Hall [Tue, 30 Apr 2013 20:45:14 +0000 (13:45 -0700)]
Generate new EGLExt class
Initially populated with EGL_ANDROID_presentation_time (moved from the
EGL14 class) and the ES-relevant parts of EGL_KHR_create_context.
Bug:
8678160
Change-Id: Ifed2ee3da264ca701ae1f4b309a0758f7fcc3acc
Dianne Hackborn [Thu, 2 May 2013 01:55:10 +0000 (18:55 -0700)]
Fix issue #
8768456: Settings > App Info under reports...
...app storage size for apps w/ .so files
The lib directories are tagged with the apk install number,
so must be explicitly passed down to installd.
Change-Id: Iae8815afd6ba964f5b2ed86a0d04a91827391ed6
Marco Nelissen [Wed, 1 May 2013 17:10:59 +0000 (10:10 -0700)]
Report actual disk space used
Report size based on blocks used, not the "nominal" size.
b/
8744465
Change-Id: Idbb72f47af6d475b51305a14be291bf01acb14bb
The Android Automerger [Wed, 1 May 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Wed, 1 May 2013 02:32:39 +0000 (19:32 -0700)]
am
cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
* commit '
cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a':
Fix glGetUniformIndices JNI prototype
Jesse Hall [Wed, 1 May 2013 02:30:47 +0000 (02:30 +0000)]
Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
Andy McFadden [Wed, 1 May 2013 00:45:36 +0000 (17:45 -0700)]
am
5d46b04b: Merge "Recommend different time source" into jb-mr2-dev
* commit '
5d46b04bd5a8ec00ea527b68aa48907d3978a007':
Recommend different time source
Andy McFadden [Wed, 1 May 2013 00:43:55 +0000 (00:43 +0000)]
Merge "Recommend different time source" into jb-mr2-dev
Jesse Hall [Mon, 29 Apr 2013 22:58:38 +0000 (15:58 -0700)]
Fix glGetUniformIndices JNI prototype
Bug:
8657863
Change-Id: I130d1b54d0cbd1f8613d3108482526d05d73d9e4
Andy McFadden [Fri, 26 Apr 2013 18:17:57 +0000 (11:17 -0700)]
Recommend different time source
We were recommending SystemClock#uptimeMillis() from Java code, but
millisecond resolution is a little coarse. We don't have an
appropriate call in SystemClock, so use System.nanoTime() instead.
Bug
8733179
Change-Id: Ifb85a03eabf7ff168966adcb5ed5914bbf3884b2
The Android Automerger [Mon, 29 Apr 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jamie Gennis [Sat, 27 Apr 2013 00:54:02 +0000 (17:54 -0700)]
am
f6d1c393: EGL: expose the EGL_KHR_create_context extension
* commit '
f6d1c3930eeba6b089ba12fb82ecad1c6622e550':
EGL: expose the EGL_KHR_create_context extension
Jamie Gennis [Fri, 26 Apr 2013 01:48:41 +0000 (18:48 -0700)]
EGL: expose the EGL_KHR_create_context extension
Bug:
8616866
Change-Id: Ic60f9f21397a1760c552b6f141d5177d1cbaf1f8
Jamie Gennis [Thu, 25 Apr 2013 19:41:28 +0000 (12:41 -0700)]
am
5b6ebd71: Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
* commit '
5b6ebd716c2bae657898562997ebb3b7d7b8a575':
libgui_test: fix a couple minor test issues
Jamie Gennis [Thu, 25 Apr 2013 19:39:10 +0000 (19:39 +0000)]
Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
The Android Automerger [Wed, 24 Apr 2013 12:55:32 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jamie Gennis [Tue, 23 Apr 2013 22:00:45 +0000 (15:00 -0700)]
libgui_test: fix a couple minor test issues
This change fixes how the MultiTextureConsumerTest.EGLImageTargetWorks checks
for pixels. It removes the call to eglSwapBuffers so that the test does not
rely on EGL swap-preserve behavior, and it makes the test use checkPixel()
rather than doing glReadPixels itself.
Bug:
8349336
Change-Id: I0f446a0083eebd07af6fd208762878b4e367725a
Matthew Xie [Tue, 23 Apr 2013 22:52:54 +0000 (15:52 -0700)]
am
3cf12f41: Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev
* commit '
3cf12f4112167cb3372cbdba2b66d48a5d56dc4b':
Add hardware feature android.hardware.bluetooth.le xml file
Matthew Xie [Tue, 23 Apr 2013 22:47:36 +0000 (22:47 +0000)]
Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev
Matthew Xie [Thu, 18 Apr 2013 22:32:04 +0000 (15:32 -0700)]
Add hardware feature android.hardware.bluetooth.le xml file
The feature is used to differ platforms that support bluetooth low
engery radio
bug
8369273
Change-Id: I8714b6b03a4e5692d4573ea7c156b002b7ee42dd
The Android Automerger [Tue, 23 Apr 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Tue, 23 Apr 2013 10:50:30 +0000 (03:50 -0700)]
am
e692ab9a: fix uninitialized variables in GLConsumer
* commit '
e692ab9a6be63193c5b52a6562d85d06c40463b8':
fix uninitialized variables in GLConsumer
The Android Automerger [Mon, 22 Apr 2013 12:55:39 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Mon, 22 Apr 2013 09:24:02 +0000 (11:24 +0200)]
fix uninitialized variables in GLConsumer
mDefaultWidth, mDefaultHeight and mCurrentScallingMode are now
initialized to the same default value that BufferQueue uses.
Change-Id: I0d4da2022b06419d12745716d8ddbd48c8869953
Mathias Agopian [Fri, 19 Apr 2013 01:11:55 +0000 (18:11 -0700)]
am
bd115338: allow dumpsys SurfaceFlinger in user builds from the shell user
* commit '
bd1153382e7a9d89922bea999a52ca21d46d6caa':
allow dumpsys SurfaceFlinger in user builds from the shell user
Mathias Agopian [Thu, 18 Apr 2013 23:41:04 +0000 (16:41 -0700)]
allow dumpsys SurfaceFlinger in user builds from the shell user
Bug:
8659013
Change-Id: I1de43bb5808cb8c1103cfc73dca59ff70fc13f91
The Android Automerger [Thu, 18 Apr 2013 12:55:41 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
OSDN Git Service
