OSDN Git Service

android-x86/frameworks-native.git
8 years agoAdd vp9 profiles and levels omx types.
Ronghua Wu [Sat, 16 Jan 2016 00:30:57 +0000 (16:30 -0800)]
Add vp9 profiles and levels omx types.

Bug: 25684127
Change-Id: Iec3cd44538be50a552477ea049f9cc34c126a5c6

8 years agoImprovements for SHA256_file_hash()
Michal Karpinski [Thu, 7 Jan 2016 20:45:02 +0000 (20:45 +0000)]
Improvements for SHA256_file_hash()

Bug: 26154009
Change-Id: I7cee0563edb7e8030716ae2925a940f3c158721e

8 years agodumpstate.cpp changes to accomodate remote bugreports
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

8 years agoMerge "Adding new bugreportremote service"
Michal Karpinski [Thu, 7 Jan 2016 11:55:00 +0000 (11:55 +0000)]
Merge "Adding new bugreportremote service"

8 years agoMerge "libgui: Fix attaching buffers without allocation"
Dan Stoza [Wed, 6 Jan 2016 18:19:28 +0000 (18:19 +0000)]
Merge "libgui: Fix attaching buffers without allocation"

8 years agoMerge "libgui: Add dequeue/attach timeout"
Dan Stoza [Wed, 6 Jan 2016 17:20:07 +0000 (17:20 +0000)]
Merge "libgui: Add dequeue/attach timeout"

8 years agolibgui: Fix attaching buffers without allocation
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

8 years agolibgui: Add dequeue/attach timeout
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

8 years agoInclude mount info on zipped bugreport.
Felipe Leme [Tue, 5 Jan 2016 22:23:02 +0000 (14:23 -0800)]
Include mount info on zipped bugreport.

BUG: 7280247
Change-Id: Iae2a7881c11564c8dbd3641f5ee5ab72c181da2a

8 years agoMerge "libinstalld: add dependency on libselinux" am: 9dee30750e
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

8 years agoMerge "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

8 years agoMerge "libinstalld: add dependency on libselinux"
Colin Cross [Tue, 5 Jan 2016 21:46:28 +0000 (21:46 +0000)]
Merge "libinstalld: add dependency on libselinux"

8 years agoAdds recovery files when writing to zip file.
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

8 years agoAdds all tombstone files when writing to zipped file.
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

8 years agoRefactored zipfile generation.
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

8 years agoMerge "Prints out how long it takes to generate each section."
Felipe Leme [Tue, 5 Jan 2016 21:03:52 +0000 (21:03 +0000)]
Merge "Prints out how long it takes to generate each section."

8 years agoPrints 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

8 years agoUse GID "wakelock" to control access to kernel wakelock
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

8 years agoMerge "More O_CLOEXEC" am: 43e4260831
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

8 years agoMerge "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

8 years agoMerge "More O_CLOEXEC"
Nick Kralevich [Thu, 24 Dec 2015 02:59:16 +0000 (02:59 +0000)]
Merge "More O_CLOEXEC"

8 years agoMore O_CLOEXEC
Nick Kralevich [Thu, 24 Dec 2015 02:58:05 +0000 (18:58 -0800)]
More O_CLOEXEC

Change-Id: I31991ed089f395174857e86e509b8190ad98f92a

8 years agoUse "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
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

8 years agoMerge "Expose setScalingMode from Surface."
Rob Carr [Tue, 22 Dec 2015 21:07:45 +0000 (21:07 +0000)]
Merge "Expose setScalingMode from Surface."

8 years agoMerge "Merge remote-tracking branch 'goog/mnc-dr-ryu-dev'"
David Riley [Tue, 22 Dec 2015 19:19:50 +0000 (19:19 +0000)]
Merge "Merge remote-tracking branch 'goog/mnc-dr-ryu-dev'"

8 years agolibinstalld: add dependency on libselinux
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

8 years agoExpose setScalingMode from Surface.
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

8 years agoMerge "Removed the -p option since screenshots are now taken by Shell."
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."

8 years agoMerge remote-tracking branch 'goog/mnc-dr-ryu-dev'
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

8 years agoMerge changes from topic 'GLES32'
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

8 years agoRemoved the -p option since screenshots are now taken by Shell.
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

8 years agoDivide huge SensorService files into managable pieces
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

8 years agoMerge "Add relative-x/y axis for mouse devices."
Jun Mukai [Fri, 18 Dec 2015 23:30:09 +0000 (23:30 +0000)]
Merge "Add relative-x/y axis for mouse devices."

8 years agodumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE) am: 03d61d95fa am...
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)

8 years agodumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE) am: 03d61d95fa
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)

8 years agoAdd GLES32 class templates
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

8 years agodumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
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)

8 years agoopengl: Update headers and registry and regenerate *api.in
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

8 years agoMerge "Add feature declarations for a VR mode."
Ruben Brunk [Fri, 18 Dec 2015 19:50:23 +0000 (19:50 +0000)]
Merge "Add feature declarations for a VR mode."

8 years agodumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
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

8 years agoAdd relative-x/y axis for mouse devices.
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

8 years agoAdding new bugreportremote service
Michal Karpinski [Tue, 15 Dec 2015 17:26:14 +0000 (17:26 +0000)]
Adding new bugreportremote service

Bug: 26152603
Change-Id: Ibe5c908f69b0f2cd704ab5c7f71a7ff13da021e3

8 years agoRemove repeated ProcessInfoService.cpp include from Android.mk
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

8 years agoMerge "Fix format specifiers for size_t types" am: 0d77698233
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

8 years agoresolve merge conflicts of ee6b4b6467 to master.
Samuel Tan [Thu, 17 Dec 2015 02:55:58 +0000 (18:55 -0800)]
resolve merge conflicts of ee6b4b6467 to master.

Change-Id: Ia17df264a6d7800a8fd2f0d39c2017ab48181894

8 years agoMerge "Fix format specifiers for size_t types"
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

8 years agoMerge "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"

8 years agoFix 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

8 years agoMerge "Add support for PersistableBundle in C++"
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++

8 years agoMerge "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++"

8 years agoMerge "atrace.rc: tracing should be disabled by default." am: cbd4cc737c
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoatrace.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

8 years agoMerge "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE."
Ronghua Wu [Wed, 16 Dec 2015 18:12:23 +0000 (18:12 +0000)]
Merge "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE."

8 years agoMerge "Allow null values for Parcel readers and writers" am: 4df4842186
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

8 years agoMerge "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

8 years agoAllow 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>
8 years agoMerge "Added xml file for FEATURE_PICTURE_IN_PICTURE"
Wale Ogunwale [Tue, 15 Dec 2015 23:01:02 +0000 (23:01 +0000)]
Merge "Added xml file for FEATURE_PICTURE_IN_PICTURE"

8 years agoMerge "Allow null values for Parcel readers and writers"
Casey Dahlin [Tue, 15 Dec 2015 21:04:16 +0000 (21:04 +0000)]
Merge "Allow null values for Parcel readers and writers"

8 years agoAdded xml file for FEATURE_PICTURE_IN_PICTURE
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

8 years agodumpstate: add audioserver
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

8 years agoAdd feature declarations for a VR mode.
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

8 years agoMerge "Don\'t redefine B_PACK_CHARS" am: 478259b574
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

8 years agoAllow 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>
8 years agoMerge "Don\'t redefine B_PACK_CHARS"
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

8 years agoMerge "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"

8 years agoMerge "Migrated dumpstate to C++." am: 1f62517b36
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++.

8 years agoDon't redefine B_PACK_CHARS
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>
8 years agoMerge "Migrated dumpstate to C++."
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++.

8 years agoMerge "Migrated dumpstate to C++."
Felipe Leme [Mon, 14 Dec 2015 23:25:48 +0000 (23:25 +0000)]
Merge "Migrated dumpstate to C++."

8 years agoMigrated 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

8 years agoMerge "Moved 'bugreportplus' from init.rc to dumpstate.rc"
Felipe Leme [Mon, 14 Dec 2015 21:59:51 +0000 (21:59 +0000)]
Merge "Moved 'bugreportplus' from init.rc to dumpstate.rc"

8 years agoMoved '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

8 years agoMerge "atrace: add database tag" am: 8b9c0e1af1
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

8 years agoMerge "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

8 years agoAdd support for PersistableBundle in C++
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

8 years agoMerge "atrace: add database tag"
Greg Hackmann [Mon, 14 Dec 2015 21:12:52 +0000 (21:12 +0000)]
Merge "atrace: add database tag"

8 years agoMerge "dumpstate: Add security log dump" am: bc611a1d3e
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

8 years agoMerge "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

8 years agoMerge "dumpstate: Add security log dump"
Mark Salyzyn [Mon, 14 Dec 2015 16:33:00 +0000 (16:33 +0000)]
Merge "dumpstate: Add security log dump"

8 years agodumpstate: 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

8 years agoMerge "Restart audioserver if servicemanager restarts"
Andy Hung [Fri, 11 Dec 2015 20:08:47 +0000 (20:08 +0000)]
Merge "Restart audioserver if servicemanager restarts"

8 years agoMerge "dumpstate: build breakage @2482293" am: c93d0937e4
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

8 years agoMerge "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

8 years agoMerge "dumpstate: build breakage @2482293"
Mark Salyzyn [Fri, 11 Dec 2015 18:43:21 +0000 (18:43 +0000)]
Merge "dumpstate: build breakage @2482293"

8 years agodumpstate: 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

8 years agomedia: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE.
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

8 years agoMerge "resolve merge conflicts of 01c1129fe6 to master."
Mark Salyzyn [Fri, 11 Dec 2015 15:35:18 +0000 (15:35 +0000)]
Merge "resolve merge conflicts of 01c1129fe6 to "

8 years agoresolve merge conflicts of 01c1129fe6 to master.
Mark Salyzyn [Fri, 11 Dec 2015 15:32:31 +0000 (07:32 -0800)]
resolve merge conflicts of 01c1129fe6 to master.

Change-Id: I84f862b4858ecc97461750833a0e6f9cf96c34c4

8 years agoMerge "Fix allocation count" am: b25116f735
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

8 years agoMerge "dumpstate: Dump eMMC 5.0 stats"
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

8 years agoMerge "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"

8 years agodumpstate: 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

8 years agoMerge "Fix allocation count"
Colin Cross [Thu, 10 Dec 2015 21:21:47 +0000 (13:21 -0800)]
Merge "Fix allocation count"
am: b25116f735

* commit 'b25116f735e00467057085c18a984aca0cc93a84':
  Fix allocation count

8 years agoMerge "Fix allocation count"
Colin Cross [Thu, 10 Dec 2015 21:15:19 +0000 (21:15 +0000)]
Merge "Fix allocation count"

8 years agoMerge "libbinder: Enable service specific error codes" am: dff3651eed
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agolibbinder: 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