OSDN Git Service
Jeff Sharkey [Wed, 13 Jan 2016 16:47:08 +0000 (09:47 -0700)]
Still not safe to mutate DE on secondary users.
Bug:
25796509,
26535916
Change-Id: I694b4a1b5fe3e31578f431bcddf7d6c4070f7852
The Android Automerger [Wed, 13 Jan 2016 08:01:07 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
Prashant Malani [Wed, 13 Jan 2016 05:39:23 +0000 (05:39 +0000)]
inputflinger: Add support for scaling and true value reporting am:
ee03865fe5 am:
a777e8b70f am:
9363c7fa06
am:
60f161920b
* commit '
60f161920be227121df1a57be430b1b5cf94bd4f':
inputflinger: Add support for scaling and true value reporting
Samuel Tan [Wed, 13 Jan 2016 05:39:17 +0000 (05:39 +0000)]
Merge "Add PersistableBundle.aidl into binder includes" am:
0904094574
am:
a06aad9986
* commit '
a06aad9986c02d9d8ab028b748d3648a2215a11e':
Add PersistableBundle.aidl into binder includes
Prashant Malani [Wed, 13 Jan 2016 05:37:31 +0000 (05:37 +0000)]
inputflinger: Add support for scaling and true value reporting am:
ee03865fe5 am:
a777e8b70f
am:
9363c7fa06
* commit '
9363c7fa063c45dc5e0bf35616928d1e036e2419':
inputflinger: Add support for scaling and true value reporting
Prashant Malani [Wed, 13 Jan 2016 05:35:45 +0000 (05:35 +0000)]
inputflinger: Add support for scaling and true value reporting am:
ee03865fe5
am:
a777e8b70f
* commit '
a777e8b70fce35e97dd8812df8b0b5eca17db550':
inputflinger: Add support for scaling and true value reporting
Prashant Malani [Wed, 13 Jan 2016 05:33:57 +0000 (05:33 +0000)]
inputflinger: Add support for scaling and true value reporting
am:
ee03865fe5
* commit '
ee03865fe5fc6ffe9deda0e0870a18206027cfaf':
inputflinger: Add support for scaling and true value reporting
Ronghua Wu [Wed, 13 Jan 2016 00:40:04 +0000 (00:40 +0000)]
Merge "Revert "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE.""
Samuel Tan [Tue, 12 Jan 2016 23:14:46 +0000 (23:14 +0000)]
Merge "Add PersistableBundle.aidl into binder includes"
am:
0904094574
* commit '
09040945744f8a8634d7472836d6be3506a77d41':
Add PersistableBundle.aidl into binder includes
Samuel Tan [Tue, 12 Jan 2016 23:09:44 +0000 (23:09 +0000)]
Merge "Add PersistableBundle.aidl into binder includes"
Jeff Sharkey [Mon, 11 Jan 2016 20:07:09 +0000 (13:07 -0700)]
Let callers specify which storage to operate on.
Since CE and DE storage can have different availability lifecycles,
callers can't operate on both at the same time. Let them use flags
to specify which storage to work with.
Remove old unused methods, and name consistently in preparation for
eventual move to AIDL.
Bug:
26466827
Change-Id: Id5d7d03f5d8814864eea801f5a46496c085afdff
Jeff Tinker [Tue, 12 Jan 2016 17:42:11 +0000 (17:42 +0000)]
Merge "Support AES-CBC sample encryption in MediaDrm"
The Android Automerger [Tue, 12 Jan 2016 08:01:08 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
Prashant Malani [Tue, 12 Jan 2016 01:08:18 +0000 (17:08 -0800)]
inputflinger: Add support for scaling and true value reporting
-1/+1 somewhat simplifies the values that can be generated by rotary
encoders, and rules out the possibility of batching and more nuanced
movement reporting.
So, we modify the device configuration to allow values other than -1 and
1 to be supported. In order to give the developer a sense of what these
values map to in terms of angular displacement, we also parse a
resolution configuration from the devices IDC file.
This will be specified as:
device.res = xxxx
of type float. If a value is not provided, a default res value of 0.0f
is used.
This patch also adds a per device scaling factor, which is used to
suitably modify the values reported (as well as the resolution) to tune
the input events generated and resulting UI according to the hardware.
This can be specified in the IDC file as:
device.scalingFactor = xxxx
of type float. If a scaling factor is not provided, a default of 1.0f
is used.
Bug:
22836852
Bug:
18707397
Change-Id: I13686f64de1b52d3f6c97b2587ae41e52d1db6e2
Dan Stoza [Mon, 11 Jan 2016 23:41:04 +0000 (23:41 +0000)]
Merge "Revert "libgui: Remove custom BufferQueue allocators""
Dan Stoza [Mon, 11 Jan 2016 23:40:44 +0000 (23:40 +0000)]
Revert "libgui: Remove custom BufferQueue allocators"
This reverts commit
acd56150573d3a6d449c0de01f93c6f269d121e3.
Change-Id: I877f63a57fbddb4dcff71b3909b460ecc05981eb
Dan Stoza [Mon, 11 Jan 2016 20:34:03 +0000 (20:34 +0000)]
Merge "libui: Remove FramebufferNativeWindow"
Dan Stoza [Mon, 11 Jan 2016 20:27:19 +0000 (20:27 +0000)]
Merge "libgui: Remove custom BufferQueue allocators"
Dan Stoza [Mon, 11 Jan 2016 20:23:26 +0000 (20:23 +0000)]
Merge "libgui: Remove custom allocator from tests"
Dan Stoza [Mon, 11 Jan 2016 17:44:14 +0000 (17:44 +0000)]
Merge "libui: Make Rect constructor 32/64-bit friendly"
The Android Automerger [Sun, 10 Jan 2016 08:01:19 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
Dan Stoza [Fri, 8 Jan 2016 21:22:49 +0000 (13:22 -0800)]
libui: Make Rect constructor 32/64-bit friendly
Makes the width/height constructor for the Rect class more flexible
with the types of integers it will accept.
Change-Id: Id88b4e6da2f84d6826e19d1cabd93fe86ad48c8d
Ronghua Wu [Fri, 8 Jan 2016 18:25:07 +0000 (18:25 +0000)]
Revert "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE."
This reverts commit
1e7ebf33dca14859dc48802ffafbc761c69bb225.
Change-Id: I764c42818a3262b4316ddad2f72d527eb9a90e46
Dan Stoza [Fri, 8 Jan 2016 18:09:47 +0000 (10:09 -0800)]
libui: Remove FramebufferNativeWindow
We no longer support the framebuffer device, so FramebufferNativeWindow
is no longer relevant.
Change-Id: I97c427bb7c0b209bbf33e61900466bde7df43e85
Dan Stoza [Fri, 8 Jan 2016 17:36:21 +0000 (09:36 -0800)]
libgui: Remove custom BufferQueue allocators
Removes the ability to set a custom GraphicBuffer allocator for a
BufferQueue. Custom-allocated buffers may still be used through the
attachBuffer call.
Change-Id: I127bdfb496fc089a61c7e266c8bd2b906d41f32e
Michal Karpinski [Thu, 7 Jan 2016 20:45:02 +0000 (20:45 +0000)]
Improvements for SHA256_file_hash()
Bug:
26154009
Change-Id: I7cee0563edb7e8030716ae2925a940f3c158721e
Michal Karpinski [Fri, 11 Dec 2015 18:04:32 +0000 (18:04 +0000)]
dumpstate.cpp changes to accomodate remote bugreports
Added four new commands to dumpstate() - route, printenv, netstat
and lsmod.
Added -R flag for remote bugreports, which will send
android.intent.action.REMOTE_BUGREPORT_FINISHED broadcast with an extra
SHA256 hash counted by a new method SHA256_file_hash(path).
Bug:
26154009
Change-Id: Ibd7cb8f38dfc8f0fa3fda3e56dcd04b7d1fe68b9
The Android Automerger [Thu, 7 Jan 2016 15:51:51 +0000 (07:51 -0800)]
merge in nyc-release history after reset to master
Michal Karpinski [Thu, 7 Jan 2016 11:55:00 +0000 (11:55 +0000)]
Merge "Adding new bugreportremote service"
The Android Automerger [Thu, 7 Jan 2016 08:00:58 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Dan Stoza [Wed, 6 Jan 2016 22:21:52 +0000 (14:21 -0800)]
libgui: Remove custom allocator from tests
The StreamSplitter test used a custom allocator to ensure that only one
GraphicBuffer was ever allocated during the test run. Now we can ensure
that by disabling allocation on the relevant BufferQueues after
allocating that one buffer, so the custom allocator is unnecessary.
Change-Id: I98289bda669c50a93ba9b70ceca1781203ad83b2
Samuel Tan [Mon, 21 Dec 2015 20:11:00 +0000 (12:11 -0800)]
Add PersistableBundle.aidl into binder includes
Add the PersistableBundle.aidl into the new /aidl/binder/
subdirectory (along with the necessary 'android' and 'os'
subdirectories) so that the aidl file will live alongside
its native implementation in libbinder. This change will
allow native-only Android checkouts (e.g. Brillo) to use
PersistableBundle.
The /aidl/ subdirectory should henceforth contain any
aidl files that live with native code.
BUG:
26292234
Change-Id: I07b49dad8afd679f33e41fa9044dffc02ec25e3e
Dan Stoza [Wed, 6 Jan 2016 18:19:28 +0000 (18:19 +0000)]
Merge "libgui: Fix attaching buffers without allocation"
Dan Stoza [Wed, 6 Jan 2016 17:20:07 +0000 (17:20 +0000)]
Merge "libgui: Add dequeue/attach timeout"
The Android Automerger [Wed, 6 Jan 2016 08:01:13 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
Dan Stoza [Tue, 5 Jan 2016 01:01:02 +0000 (17:01 -0800)]
libgui: Fix attaching buffers without allocation
This changes the way that BufferQueue selects slots in
waitForFreeSlotThenRelock. This method is called from both
dequeueBuffer and attachBuffer, but those two methods actually have
different preferences:
dequeueBuffer wants a slot with a buffer if possible (to avoid
unnecessary allocations), but will settle for a slot without a buffer
if no free buffers are available.
attachBuffer wants a slot without a buffer if possible (to avoid
clobbering an existing buffer), but will settle with clobbering a free
buffer if no empty slots are available.
These preferences are now respected, which has the side-effect of
fixing a bug where it was not possible to attach a buffer if allocation
is disabled (since the previous implementation assumed finding a slot
without a buffer meant that the caller intended to allocate a buffer,
which would accordingly be blocked since allocation is disabled).
Bug:
26387372
Change-Id: Iefd550fd01925d8c51d6f062d5708d1f6d517edd
Dan Stoza [Tue, 30 Jun 2015 20:43:32 +0000 (13:43 -0700)]
libgui: Add dequeue/attach timeout
Adds the ability to specify the timeout when dequeueBuffer or
attachBuffer block due to the lack of a free buffer/slot. By default,
these will block indefinitely (which is signified by a timeout of -1).
When a timeout (other than -1) is specified, non-blocking mode is
disabled and the given timeout will be used instead.
Bug:
25196773
Change-Id: I17fdbeebccb7c8d878703d758ac1209608258e61
Felipe Leme [Tue, 5 Jan 2016 22:23:02 +0000 (14:23 -0800)]
Include mount info on zipped bugreport.
BUG:
7280247
Change-Id: Iae2a7881c11564c8dbd3641f5ee5ab72c181da2a
Colin Cross [Tue, 5 Jan 2016 21:52:13 +0000 (21:52 +0000)]
Merge "libinstalld: add dependency on libselinux" am:
9dee30750e
am:
3c2103ef33
* commit '
3c2103ef33d40b95f773cc2224f0399833b1a8cc':
libinstalld: add dependency on libselinux
Colin Cross [Tue, 5 Jan 2016 21:50:02 +0000 (21:50 +0000)]
Merge "libinstalld: add dependency on libselinux"
am:
9dee30750e
* commit '
9dee30750e85dcfc02fb9fd4cc6169957de91d0b':
libinstalld: add dependency on libselinux
Colin Cross [Tue, 5 Jan 2016 21:46:28 +0000 (21:46 +0000)]
Merge "libinstalld: add dependency on libselinux"
Felipe Leme [Tue, 5 Jan 2016 21:35:44 +0000 (13:35 -0800)]
Adds recovery files when writing to zip file.
BUG:
25351711
Change-Id: I3bac7a0d3a6f388b46570595d22436f0a4f74bee
Felipe Leme [Tue, 5 Jan 2016 21:25:34 +0000 (13:25 -0800)]
Adds all tombstone files when writing to zipped file.
Currently, a bugreport simply cats any tombstone file modified in the
last half an hour into the bugreport. This is a problem since the
tombstones contain a lot of really valuable information, and sometimes
users don't get a bugreport in this time frame. In addition, some of our
monkey testing has the same problem.
Since now dumpstate can create a zip file, we can include all directly
on it, although still using the old mechanism when it's creating it (for example, when invoked through 'adb bugreport').
BUG:
25974224
Change-Id: Ie29fd7d91953d91232b0db1c9588043aee13f93e
Felipe Leme [Tue, 22 Dec 2015 00:02:13 +0000 (16:02 -0800)]
Refactored zipfile generation.
Previously, the bugreport.zip was only created at after dumpstate
finished, at which point the temporary file was added to it.
With this refactoring, the bugreport.zip is created earlier on and the
temporary file is added at the end: although this change doesn't alter
the final result, it allows future changes to add more files to the .zip
BUG:
26293568
Change-Id: Ic0a111d009aac954c9746130df226a2dfeb679bc
Felipe Leme [Tue, 5 Jan 2016 21:03:52 +0000 (21:03 +0000)]
Merge "Prints out how long it takes to generate each section."
Felipe Leme [Mon, 21 Dec 2015 17:55:22 +0000 (09:55 -0800)]
Prints out how long it takes to generate each section.
It's done using a DurationReporter helper class that prints starts
counting when constructed and prints the duration when destructed.
Typical usage:
function do_something() {
DurationReporter duration_reporter(title);
// Do something.
}
Change-Id: I87134d9a1b003300384376c242a3c034a46244c4
The Android Automerger [Tue, 29 Dec 2015 08:00:50 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Pavlin Radoslavov [Tue, 24 Nov 2015 03:10:14 +0000 (19:10 -0800)]
Use GID "wakelock" to control access to kernel wakelock
Bug:
25864142
Change-Id: I2731849378f6ff57fb026dab4288426c45cd60cd
The Android Automerger [Thu, 24 Dec 2015 08:00:56 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Nick Kralevich [Thu, 24 Dec 2015 03:19:21 +0000 (03:19 +0000)]
Merge "More O_CLOEXEC" am:
43e4260831
am:
66824c36ce
* commit '
66824c36ce08ae86a057440e33a5fe1a23ef01f1':
More O_CLOEXEC
Nick Kralevich [Thu, 24 Dec 2015 03:16:38 +0000 (19:16 -0800)]
Merge "More O_CLOEXEC"
am:
43e4260831
* commit '
43e4260831cc3d0d96c05fe18a8cad3018b5795f':
More O_CLOEXEC
Nick Kralevich [Thu, 24 Dec 2015 02:59:16 +0000 (02:59 +0000)]
Merge "More O_CLOEXEC"
Nick Kralevich [Thu, 24 Dec 2015 02:58:05 +0000 (18:58 -0800)]
More O_CLOEXEC
Change-Id: I31991ed089f395174857e86e509b8190ad98f92a
Alex Cheung [Wed, 23 Dec 2015 22:49:50 +0000 (14:49 -0800)]
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/
26154276
The Android Automerger [Wed, 23 Dec 2015 08:00:59 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
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'"
The Android Automerger [Tue, 22 Dec 2015 08:00:51 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Colin Cross [Tue, 22 Dec 2015 00:21:45 +0000 (16:21 -0800)]
libinstalld: add dependency on libselinux
libinstalld uses headers from libselinux, add a LOCAL_SHARED_LIBRARIES
dependency on libselinux.
Change-Id: Ic12c55547526638810bcc1ac952d205f2f163fd3
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
The Android Automerger [Mon, 21 Dec 2015 08:00:29 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
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
The Android Automerger [Sun, 20 Dec 2015 08:01:16 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
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
Jeff Tinker [Fri, 18 Dec 2015 19:52:06 +0000 (11:52 -0800)]
Support AES-CBC sample encryption in MediaDrm
bug:
23719082
Change-Id: I8f892657d8be888056165b98c7c810339e7a8b41
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
Michal Karpinski [Tue, 15 Dec 2015 17:26:14 +0000 (17:26 +0000)]
Adding new bugreportremote service
Bug:
26152603
Change-Id: Ibe5c908f69b0f2cd704ab5c7f71a7ff13da021e3
The Android Automerger [Thu, 17 Dec 2015 08:01:02 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
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."
The Android Automerger [Wed, 16 Dec 2015 08:01:09 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
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