OSDN Git Service
Rob Carr [Tue, 22 Dec 2015 21:07:45 +0000 (21:07 +0000)]
Merge "Expose setScalingMode from Surface."
David Riley [Tue, 22 Dec 2015 19:19:50 +0000 (19:19 +0000)]
Merge "Merge remote-tracking branch 'goog/mnc-dr-ryu-dev'"
Robert Carr [Thu, 17 Dec 2015 02:14:03 +0000 (18:14 -0800)]
Expose setScalingMode from Surface.
While we are here fix a validation error causing
NATIVE_WINDOW_SCALING_MODE_NO_SCALE_CROP to never be applied.
Furthermore, we remove GLConsumer logic causing the scaling mode to
be reinitialized when buffers change.
Bug:
26010823
Change-Id: I1bf1e4fdc2eded67ff401783cf24f920e4684326
Felipe Leme [Mon, 21 Dec 2015 20:45:28 +0000 (20:45 +0000)]
Merge "Removed the -p option since screenshots are now taken by Shell."
David Riley [Mon, 21 Dec 2015 20:37:36 +0000 (12:37 -0800)]
Merge remote-tracking branch 'goog/mnc-dr-ryu-dev'
Change-Id: Ia7f27eb15e26b75ad7056ec52fd8f9b66937e39e
Pablo Ceballos [Mon, 21 Dec 2015 18:42:02 +0000 (18:42 +0000)]
Merge changes from topic 'GLES32'
* changes:
Add GLES32 class templates
opengl: Update headers and registry and regenerate *api.in
Felipe Leme [Mon, 21 Dec 2015 18:35:43 +0000 (10:35 -0800)]
Removed the -p option since screenshots are now taken by Shell.
BUG:
26274653
Change-Id: I55760fe01bded0d194f2c56ebc809d555ceedf77
Peng Xu [Fri, 11 Dec 2015 02:02:41 +0000 (18:02 -0800)]
Divide huge SensorService files into managable pieces
Splitted SensorService.cpp and SensorService.h into smaller more
manageable pieces with the embedded classes/structs now in individual
files.
Change-Id: I5e75c41b9e0e5c9aff102fe4b0f142c61d1203e2
Jun Mukai [Fri, 18 Dec 2015 23:30:09 +0000 (23:30 +0000)]
Merge "Add relative-x/y axis for mouse devices."
Mark Salyzyn [Fri, 18 Dec 2015 21:31:22 +0000 (13:31 -0800)]
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE) am:
03d61d95fa am:
dc482d7711 -s ours
am:
b1000f209e -s ours
* commit '
b1000f209e10ea4710e924c4c97a1990f53dd90e':
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
Mark Salyzyn [Fri, 18 Dec 2015 21:22:38 +0000 (21:22 +0000)]
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE) am:
03d61d95fa
am:
dc482d7711 -s ours
* commit '
dc482d771158299d470f017d0bd5ada5db2a5a92':
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
Pablo Ceballos [Fri, 30 Oct 2015 17:31:22 +0000 (10:31 -0700)]
Add GLES32 class templates
- Added a script that takes the #defines in gl2/3.h and formats them
for use in the Java template.
- Generated GLES32.spec using glgen2.
- Added full support for void* in glgen. It wasn't previously
necessary since the apis were using GLvoid instead.
- Created the GLES32 header stubs. Added stubs for GLES32 functions
that couldn't be handled by the code generator. Added checks in the
checks.spec file where appropriate.
- Generated the GLES32 class and JNI.
Change-Id: Ifc8512ed56af75bbc3e7ec2ea1377895201d5325
Mark Salyzyn [Fri, 18 Dec 2015 20:46:30 +0000 (20:46 +0000)]
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
am:
03d61d95fa
* commit '
03d61d95fa6a321bf26548b320a1a9c8dc78e124':
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
Pablo Ceballos [Tue, 27 Oct 2015 21:00:42 +0000 (14:00 -0700)]
opengl: Update headers and registry and regenerate *api.in
- Update the registry xml files and python scripts in glgen2. Took
r32166 from:
https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/
- Update the GLES headers (and add gl32.h). Took r32166 from:
https://cvs.khronos.org/svn/repos/registry/trunk/public/gles/api/
- Include gl32.h in libs/hooks.h
- Update glgen2/glgen.py to properly handle glPathGlyphIndexRangeNV
which uses an explicit array parameter (and is the only GL extension
that does this). This modification also fixes a bunch of whitespace
issues in the *.in files.
- Get rid of the remaining bits of glTrace code in glgen2/glgen.py
- Regenerate the *.in files with glgen2
- The official glext.h hasn't been updated and differs from the
registry in the second to last argument to glMultiDrawElementsEXT.
This file was previously modified to match the registry and this
modification has been carried forward in this commit.
- getProcAddress.cpp was failing to compile for ARM because the
inline assembly for loading the function pointer now exceeds the
limit of 4095 for an immediate offset to the ldr instruction on ARM.
Modify it to instead load the offset into a register and add it with
an add instruction before the ldr instruction.
- Khronos has added #ifdef GL_GLEXT_PROTOTYPES guards to the function
prototypes in gl2/3.h. In order to keep existing code compiling add
#define GL_GLEXT_PROTOTYPES to include/KHR/khrplatform.h for now.
This should be fixed upstream and when it is this can be removed.
Change-Id: I952ace43879557d7c363810b83d65159ad2ad1e3
Ruben Brunk [Fri, 18 Dec 2015 19:50:23 +0000 (19:50 +0000)]
Merge "Add feature declarations for a VR mode."
Mark Salyzyn [Fri, 18 Dec 2015 18:14:46 +0000 (10:14 -0800)]
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
- temporary measure until root issues can be resolved.
Bug:
23685592
Change-Id: Ia33f4e3928a457c3dcd730ad2c2c57d13fbf133d
Jun Mukai [Thu, 3 Dec 2015 09:14:46 +0000 (01:14 -0800)]
Add relative-x/y axis for mouse devices.
Used by Ie21e521f3e5c581f976dc0feb5d84bfa48b046cd.
Bug:
5452473
Change-Id: I4189eb4d93f50c2865b7a325727be5ceebcc71f8
Samuel Tan [Thu, 17 Dec 2015 04:13:07 +0000 (20:13 -0800)]
Remove repeated ProcessInfoService.cpp include from Android.mk
BUG: None
Change-Id: I990f3bc7a10a98cfb52fbfd741a0f00492abb94a
Samuel Tan [Thu, 17 Dec 2015 03:03:30 +0000 (03:03 +0000)]
Merge "Fix format specifiers for size_t types" am:
0d77698233
am:
656186456f
* commit '
656186456f2413831bc0127ac6843ca6f2d8e66e':
Fix format specifiers for size_t types
Samuel Tan [Thu, 17 Dec 2015 02:55:58 +0000 (18:55 -0800)]
resolve merge conflicts of
ee6b4b6467 to master.
Change-Id: Ia17df264a6d7800a8fd2f0d39c2017ab48181894
Samuel Tan [Thu, 17 Dec 2015 01:25:38 +0000 (01:25 +0000)]
Merge "Fix format specifiers for size_t types"
am:
0d77698233
* commit '
0d77698233ffcbc812c2586693546355ce521603':
Fix format specifiers for size_t types
Samuel Tan [Thu, 17 Dec 2015 01:19:10 +0000 (01:19 +0000)]
Merge "Fix format specifiers for size_t types"
Samuel Tan [Thu, 17 Dec 2015 01:13:29 +0000 (17:13 -0800)]
Fix format specifiers for size_t types
Use %zu instead of %u for logging size_t types, which
are of the unsigned long type, not the unsigned int type.
BUG: None
Change-Id: I5af6c2ea544a5f11b283bc9aebe8b5f0cfc605ec
Samuel Tan [Thu, 17 Dec 2015 00:48:42 +0000 (00:48 +0000)]
Merge "Add support for PersistableBundle in C++"
am:
aca58acb59
* commit '
aca58acb594efb35b51e49d2d330fe1dbe16d7fd':
Add support for PersistableBundle in C++
Samuel Tan [Thu, 17 Dec 2015 00:35:28 +0000 (00:35 +0000)]
Merge "Add support for PersistableBundle in C++"
Nick Kralevich [Wed, 16 Dec 2015 23:44:20 +0000 (23:44 +0000)]
Merge "atrace.rc: tracing should be disabled by default." am:
cbd4cc737c
am:
982e451512
* commit '
982e4515128f69638249427715ad9bb321361aa8':
atrace.rc: tracing should be disabled by default.
Nick Kralevich [Wed, 16 Dec 2015 21:41:31 +0000 (21:41 +0000)]
Merge "atrace.rc: tracing should be disabled by default."
am:
cbd4cc737c
* commit '
cbd4cc737cc99b2ae7ac22ca4b2bb52b86b8e6ae':
atrace.rc: tracing should be disabled by default.
Nick Kralevich [Wed, 16 Dec 2015 21:31:46 +0000 (21:31 +0000)]
Merge "atrace.rc: tracing should be disabled by default."
Nick Kralevich [Wed, 16 Dec 2015 20:37:25 +0000 (12:37 -0800)]
atrace.rc: tracing should be disabled by default.
Bug:
26217098
Change-Id: I6066c433d19c2d1c220669a9a78f5085af8c1d4b
Ronghua Wu [Wed, 16 Dec 2015 18:12:23 +0000 (18:12 +0000)]
Merge "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE."
Casey Dahlin [Wed, 16 Dec 2015 00:53:54 +0000 (00:53 +0000)]
Merge "Allow null values for Parcel readers and writers" am:
4df4842186
am:
f15194ae49
* commit '
f15194ae49b77b030a4062d2a083803dce410467':
Allow null values for Parcel readers and writers
Casey Dahlin [Wed, 16 Dec 2015 00:49:46 +0000 (16:49 -0800)]
Merge "Allow null values for Parcel readers and writers"
am:
4df4842186
* commit '
4df484218624081ee5de68798fe8bbf26efdc069':
Allow null values for Parcel readers and writers
Casey Dahlin [Wed, 25 Nov 2015 23:09:45 +0000 (15:09 -0800)]
Allow null values for Parcel readers and writers
Test: AIDL integration tests pass
Bug:
25969194
Change-Id: Ib7023c8e02af49e08c9921f1d097e5967c1d378e
Signed-off-by: Casey Dahlin <sadmac@google.com>
Wale Ogunwale [Tue, 15 Dec 2015 23:01:02 +0000 (23:01 +0000)]
Merge "Added xml file for FEATURE_PICTURE_IN_PICTURE"
Casey Dahlin [Tue, 15 Dec 2015 21:04:16 +0000 (21:04 +0000)]
Merge "Allow null values for Parcel readers and writers"
Wale Ogunwale [Tue, 15 Dec 2015 20:59:05 +0000 (12:59 -0800)]
Added xml file for FEATURE_PICTURE_IN_PICTURE
Bug:
25580820
Bug:
26187878
Change-Id: I94471904965605b6b892536883af1e1a9dfe1193
Andy Hung [Tue, 15 Dec 2015 20:42:50 +0000 (12:42 -0800)]
dumpstate: add audioserver
enable bugreport callstack dump of /system/bin/audioserver
Bug:
24511453
Change-Id: I1c73c2ec299913b717e69b357bd669babafe58d1
Ruben Brunk [Sat, 5 Dec 2015 00:24:31 +0000 (16:24 -0800)]
Add feature declarations for a VR mode.
Bug:
22855417
Change-Id: I147c910fdb13969fa6cb49a2caedf55634a4c7f1
Casey Dahlin [Tue, 15 Dec 2015 02:01:11 +0000 (18:01 -0800)]
Merge "Don\'t redefine B_PACK_CHARS" am:
478259b574
am:
e9ddb0d00d
* commit '
e9ddb0d00d935ed64a78bc212197ca84b090be13':
Don't redefine B_PACK_CHARS
Casey Dahlin [Wed, 25 Nov 2015 23:09:45 +0000 (15:09 -0800)]
Allow null values for Parcel readers and writers
Test: AIDL integration tests pass
Bug:
25969194
Change-Id: Ib7023c8e02af49e08c9921f1d097e5967c1d378e
Signed-off-by: Casey Dahlin <sadmac@google.com>
Casey Dahlin [Tue, 15 Dec 2015 01:46:50 +0000 (17:46 -0800)]
Merge "Don\'t redefine B_PACK_CHARS"
am:
478259b574
* commit '
478259b574b6353437b6d5a03caaa4449add428a':
Don't redefine B_PACK_CHARS
Casey Dahlin [Tue, 15 Dec 2015 01:09:50 +0000 (01:09 +0000)]
Merge "Don't redefine B_PACK_CHARS"
Felipe Leme [Tue, 15 Dec 2015 01:05:49 +0000 (01:05 +0000)]
Merge "Migrated dumpstate to C++." am:
1f62517b36
am:
32a59625e0 -s ours
* commit '
32a59625e0a70eb38648320ddde84e6c91cc9cef':
Migrated dumpstate to C++.
Casey Dahlin [Tue, 15 Dec 2015 00:09:06 +0000 (16:09 -0800)]
Don't redefine B_PACK_CHARS
Change-Id: I5dfaca405f0f866e697d5ae546ead8a8eb6de7ca
Test: make checkbuild succeeds
Bug:
25868260
Signed-off-by: Casey Dahlin <sadmac@google.com>
Felipe Leme [Mon, 14 Dec 2015 23:56:22 +0000 (23:56 +0000)]
Merge "Migrated dumpstate to C++."
am:
1f62517b36
* commit '
1f62517b3654a3c0e95ea4d5b3664fac8115acdf':
Migrated dumpstate to C++.
Felipe Leme [Mon, 14 Dec 2015 23:25:48 +0000 (23:25 +0000)]
Merge "Migrated dumpstate to C++."
Felipe Leme [Mon, 14 Dec 2015 23:09:56 +0000 (15:09 -0800)]
Migrated dumpstate to C++.
Changes required:
- Explicity casting function pointers.
- Moving variables initialization before 'goto' statements.
- Changing string references from 'char *' to 'const char *'.
- Using 'extern "C"' so device-dependent implementation of
'dumpstate_board()' can be written in C or C++.
BUG:
25563823
Change-Id: Ibeb70fd23e64e9b530736b554a372cb232fe1a44
Felipe Leme [Mon, 14 Dec 2015 21:59:51 +0000 (21:59 +0000)]
Merge "Moved 'bugreportplus' from init.rc to dumpstate.rc"
Felipe Leme [Mon, 14 Dec 2015 20:46:00 +0000 (12:46 -0800)]
Moved 'bugreportplus' from init.rc to dumpstate.rc
BUG:
26034608
Change-Id: I633a5c0ca34ab60cfd5b9c8052b546970288d9d6
Greg Hackmann [Mon, 14 Dec 2015 21:23:40 +0000 (13:23 -0800)]
Merge "atrace: add database tag" am:
8b9c0e1af1
am:
361515a9b5
* commit '
361515a9b5c64f625305d0824048bb65a71c9595':
atrace: add database tag
Greg Hackmann [Mon, 14 Dec 2015 21:20:47 +0000 (13:20 -0800)]
Merge "atrace: add database tag"
am:
8b9c0e1af1
* commit '
8b9c0e1af14bf07b216edd1b995048790ddabaca':
atrace: add database tag
Samuel Tan [Tue, 24 Nov 2015 02:22:12 +0000 (18:22 -0800)]
Add support for PersistableBundle in C++
Add support for PersistableBundle, a mapping from
String values to various types, in C++.
BUG:
25815410
Change-Id: If609b294a1709314bb4220afc4f2269b556babb8
Greg Hackmann [Mon, 14 Dec 2015 21:12:52 +0000 (21:12 +0000)]
Merge "atrace: add database tag"
Mark Salyzyn [Mon, 14 Dec 2015 16:52:27 +0000 (08:52 -0800)]
Merge "dumpstate: Add security log dump" am:
bc611a1d3e
am:
0c124edf7c
* commit '
0c124edf7c633588e300f1855d22739194ba7194':
dumpstate: Add security log dump
Mark Salyzyn [Mon, 14 Dec 2015 16:48:52 +0000 (08:48 -0800)]
Merge "dumpstate: Add security log dump"
am:
bc611a1d3e
* commit '
bc611a1d3e2beea849a251fecda096ed142519a6':
dumpstate: Add security log dump
Mark Salyzyn [Mon, 14 Dec 2015 16:33:00 +0000 (16:33 +0000)]
Merge "dumpstate: Add security log dump"
Mark Salyzyn [Fri, 11 Dec 2015 21:04:02 +0000 (13:04 -0800)]
dumpstate: Add security log dump
Bug:
26029733
Change-Id: I2e5b44d642bbac7f62f63388dd8a3123f2abeafe
Andy Hung [Fri, 11 Dec 2015 20:08:47 +0000 (20:08 +0000)]
Merge "Restart audioserver if servicemanager restarts"
Mark Salyzyn [Fri, 11 Dec 2015 19:10:38 +0000 (11:10 -0800)]
Merge "dumpstate: build breakage @
2482293" am:
c93d0937e4
am:
8197219a6e
* commit '
8197219a6e34d72174fc69ff60608afec912a4f4':
dumpstate: build breakage @
2482293
Mark Salyzyn [Fri, 11 Dec 2015 19:01:01 +0000 (11:01 -0800)]
Merge "dumpstate: build breakage @
2482293"
am:
c93d0937e4
* commit '
c93d0937e4e86a260f4dc6b91971b6750f67a3f3':
dumpstate: build breakage @
2482293
Mark Salyzyn [Fri, 11 Dec 2015 18:43:21 +0000 (18:43 +0000)]
Merge "dumpstate: build breakage @
2482293"
Mark Salyzyn [Fri, 11 Dec 2015 18:41:52 +0000 (10:41 -0800)]
dumpstate: build breakage @
2482293
aosp is in C, internal is C++, struct must be explicit
Bug:
24200279
Change-Id: I1c9d8156a86db6de73ee5b70063e63b38170b052
Ronghua Wu [Thu, 10 Dec 2015 20:28:43 +0000 (12:28 -0800)]
media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE.
Bug:
25684127
Change-Id: I1f6e97e60ae5868073a5768e956473c4b7348afa
Mark Salyzyn [Fri, 11 Dec 2015 15:35:18 +0000 (15:35 +0000)]
Merge "resolve merge conflicts of
01c1129fe6 to "
Mark Salyzyn [Fri, 11 Dec 2015 15:32:31 +0000 (07:32 -0800)]
resolve merge conflicts of
01c1129fe6 to master.
Change-Id: I84f862b4858ecc97461750833a0e6f9cf96c34c4
Colin Cross [Fri, 11 Dec 2015 15:27:18 +0000 (07:27 -0800)]
Merge "Fix allocation count" am:
b25116f735
am:
4b5d182fd5
* commit '
4b5d182fd5055a4052237785164f543fe49b8f1d':
Fix allocation count
Mark Salyzyn [Fri, 11 Dec 2015 15:24:05 +0000 (07:24 -0800)]
Merge "dumpstate: Dump eMMC 5.0 stats"
am:
f9b3fc457f
* commit '
f9b3fc457f22be834e6bc6c3f704d7ddb38dcbb8':
dumpstate: Dump eMMC 5.0 stats
Mark Salyzyn [Fri, 11 Dec 2015 15:17:26 +0000 (15:17 +0000)]
Merge "dumpstate: Dump eMMC 5.0 stats"
Mark Salyzyn [Wed, 9 Dec 2015 19:21:28 +0000 (11:21 -0800)]
dumpstate: Dump eMMC 5.0 stats
Extended csd EXT_CSD_REV, PRE_EOL_INFO, DEVICE_LIFE_TIME_EST_TYP_A,
and DEVICE_LIFE_TIME_EST_TYP_B fields printed if available. Allow
dumpstate access to /sys/kernel/debug/mmc0/mmc0:0001/ext_csd.
Bug:
24200279
Change-Id: I310bdcf546a9307cf927f109359ad5a6d24b70f8
Colin Cross [Thu, 10 Dec 2015 21:21:47 +0000 (13:21 -0800)]
Merge "Fix allocation count"
am:
b25116f735
* commit '
b25116f735e00467057085c18a984aca0cc93a84':
Fix allocation count
Colin Cross [Thu, 10 Dec 2015 21:15:19 +0000 (21:15 +0000)]
Merge "Fix allocation count"
Christopher Wiley [Wed, 9 Dec 2015 22:42:27 +0000 (22:42 +0000)]
Merge "libbinder: Enable service specific error codes" am:
dff3651eed
am:
4be265f142
* commit '
4be265f14235aa8e3339fca9abca847517fd3a74':
libbinder: Enable service specific error codes
Christopher Wiley [Wed, 9 Dec 2015 22:39:31 +0000 (14:39 -0800)]
Merge "libbinder: Enable service specific error codes"
am:
dff3651eed
* commit '
dff3651eed393f4a6e7b5fcbea1d91de981e91a0':
libbinder: Enable service specific error codes
Christopher Wiley [Wed, 9 Dec 2015 22:34:58 +0000 (22:34 +0000)]
Merge "libbinder: Enable service specific error codes"
Christopher Wiley [Sat, 21 Nov 2015 01:48:27 +0000 (17:48 -0800)]
libbinder: Enable service specific error codes
Add another factory method that takes a message and service
specific error code.
Bug:
25800533
Test: system/tools/aidl integration tests pass
Change-Id: I592cb7def0538576965d14c200ab58548b3bef32
Felipe Leme [Wed, 9 Dec 2015 18:20:46 +0000 (18:20 +0000)]
Merge "Fixed logic that was passing NULL to a std::string parameter and crashing dumpstate."
Felipe Leme [Wed, 9 Dec 2015 18:11:47 +0000 (10:11 -0800)]
Fixed logic that was passing NULL to a std::string parameter and
crashing dumpstate.
BUG:
8420215
Change-Id: If2f3ebad559683b5b6a8c2209de93ac3bec4fb1e
Jeff Tinker [Wed, 9 Dec 2015 17:07:42 +0000 (17:07 +0000)]
Merge "Remove unused MediaDrm.unprovisionDevice"
Jeff Tinker [Wed, 9 Dec 2015 16:41:06 +0000 (08:41 -0800)]
Remove unused MediaDrm.unprovisionDevice
bug:
25726218
Change-Id: Id45b4d509ab6b9db01c749af6533521992d89452
Colin Cross [Wed, 9 Dec 2015 01:15:50 +0000 (17:15 -0800)]
Fix allocation count
The realloc case in continueWrite should not increment the counter,
the pointer passed to realloc is guaranteed to be non-NULL so the total
number of allocations will not have changed.
When realloc is called in restartWrite mData has not been checked
against NULL, increment the counter if it was NULL.
Bug:
26086286
Change-Id: I4c8af450cca1868b91793c0c5f0d8c4b4b5badbe
Pablo Ceballos [Tue, 8 Dec 2015 23:52:31 +0000 (23:52 +0000)]
Merge "SF: Prevent accidentally re-adding a removed layer"
Felipe Leme [Tue, 8 Dec 2015 23:51:08 +0000 (23:51 +0000)]
Merge "Take screenshot right away when invoked with -P."
Pablo Ceballos [Tue, 8 Dec 2015 21:53:59 +0000 (13:53 -0800)]
SF: Prevent accidentally re-adding a removed layer
Bug
25887783
Change-Id: Ib13ebdfb55d40c0f2175b2bc521214a07281e69a
Andreas Gampe [Tue, 8 Dec 2015 17:25:42 +0000 (17:25 +0000)]
Merge "Installd: Refactor in preparation for OTA"
Andreas Gampe [Thu, 12 Nov 2015 04:43:16 +0000 (20:43 -0800)]
Installd: Refactor in preparation for OTA
Refactor installd code so reuse with a few key plugin functions is
possible. Do a bit of code cleanup.
Bug:
25612095
Change-Id: I544604f0a391583a4c07887a8234343a3a255942
Dan Stoza [Tue, 8 Dec 2015 17:16:39 +0000 (17:16 +0000)]
Merge "Fix the execution point of onFrameAvailable/onFrameReplaced callbacks" am:
789ede379d am:
67322258c0
am:
d76538a4db
* commit '
d76538a4dbc69b4231150a8902049fb13f5140be':
Fix the execution point of onFrameAvailable/onFrameReplaced callbacks
Prashant Malani [Tue, 8 Dec 2015 17:16:33 +0000 (17:16 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev am:
68fca5a176 am:
e50ab08fd6 am:
b7b7fa1769
am:
37ee3a755c
* commit '
37ee3a755cca56b9324bcc16ef0a781a14f5671d':
inputflinger: Initial support for rotary encoders.
Dimitry Ivanov [Tue, 8 Dec 2015 17:16:27 +0000 (17:16 +0000)]
Merge "Replace libGLESv3 symlink with shared library" am:
18ff655766 am:
bc432368f4
am:
7c1cd3422a
* commit '
7c1cd3422a272ce6de4a0ae71f64466601d6c172':
Replace libGLESv3 symlink with shared library
Dan Stoza [Tue, 8 Dec 2015 17:13:34 +0000 (17:13 +0000)]
Merge "Fix the execution point of onFrameAvailable/onFrameReplaced callbacks" am:
789ede379d
am:
67322258c0
* commit '
67322258c0a42852bee446a5a99f8b64e1953683':
Fix the execution point of onFrameAvailable/onFrameReplaced callbacks
Dan Stoza [Tue, 8 Dec 2015 17:08:13 +0000 (09:08 -0800)]
Merge "Fix the execution point of onFrameAvailable/onFrameReplaced callbacks"
am:
789ede379d
* commit '
789ede379d2f19ce284866c72bcaad7e8255b1cc':
Fix the execution point of onFrameAvailable/onFrameReplaced callbacks
Dan Stoza [Tue, 8 Dec 2015 17:05:25 +0000 (17:05 +0000)]
Merge "Fix the execution point of onFrameAvailable/onFrameReplaced callbacks"
Prashant Malani [Tue, 8 Dec 2015 01:36:18 +0000 (01:36 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev am:
68fca5a176 am:
e50ab08fd6
am:
b7b7fa1769
* commit '
b7b7fa1769b6a13461705309659846e99deb8cf2':
inputflinger: Initial support for rotary encoders.
Prashant Malani [Tue, 8 Dec 2015 01:33:04 +0000 (01:33 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev am:
68fca5a176
am:
e50ab08fd6
* commit '
e50ab08fd676c78bc1d826dc2172cf370feb54c0':
inputflinger: Initial support for rotary encoders.
Prashant Malani [Tue, 8 Dec 2015 01:30:53 +0000 (01:30 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
am:
68fca5a176
* commit '
68fca5a1763203164a19a9aa983895242a671387':
inputflinger: Initial support for rotary encoders.
Prashant Malani [Tue, 8 Dec 2015 01:27:17 +0000 (01:27 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
Dimitry Ivanov [Mon, 7 Dec 2015 23:39:17 +0000 (23:39 +0000)]
Merge "Replace libGLESv3 symlink with shared library" am:
18ff655766
am:
bc432368f4
* commit '
bc432368f410d628d21435c9f8fbcdf6bb68ef95':
Replace libGLESv3 symlink with shared library
Dimitry Ivanov [Mon, 7 Dec 2015 23:16:20 +0000 (23:16 +0000)]
Merge "Replace libGLESv3 symlink with shared library"
am:
18ff655766
* commit '
18ff6557667f3d130ad1f83e04f3b175f8b8cf6d':
Replace libGLESv3 symlink with shared library
Elliott Hughes [Mon, 7 Dec 2015 22:21:50 +0000 (14:21 -0800)]
Track rename from base/ to android-base/.
Change-Id: I13839256a0fb159a3b53009c2cb6b0fa639bad2e
Felipe Leme [Mon, 7 Dec 2015 22:03:50 +0000 (14:03 -0800)]
Take screenshot right away when invoked with -P.
Traditionally, the screenshot was not taken right away because it could
skew other services like the Surface Flinger, and such approach often
resulted on irrelevant screenshots.
Now there is more user-friendly workflow, where the bugreport progress
is shown in the UI and the user can take further actions. In this
workflow, it's ok to take the screeshot right away, since the other
features might already be causing interference: if the user doesn't want
interference, the old workflow should be used instead.
Since the new workflow requires the -P (for Progress) parameter, such
parameter can also be used to determine when to take the screenshot.
Also added progress statistics at the end of the bugreport.
BUG:
8420215
Change-Id: I9dad8ea59d47848f217182ccec0f527b42e07f50
Dimitry Ivanov [Mon, 7 Dec 2015 19:00:58 +0000 (19:00 +0000)]
Merge "Replace libGLESv3 symlink with shared library"