Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

May 07, 2014

  1. Merge "Remove unused LOCAL_LDLIBS."

    Ying Wang authored Gerrit Code Review committed
  2. Remove unused LOCAL_LDLIBS.

    Change-Id: I0a648d3aab329edbbd8c4417fc053f024081933d
    Ying Wang authored

Jul 24, 2013

  1. remove include of utils/Log.h

    Remove the include of utils/Log.h to avoid having to pull in liblog.
    Add pthread.h because it was getting it implicitly through utils/Log.h.
    
    Change-Id: Ib05b2934fe24cbb47eb4daf41cd392830caceeed
    Colin Cross authored

Sep 06, 2012

  1. am 4a21314: am 274d057: Merge "Added support for parsing XMF versions…

    … 1.00 and 1.01 headers"
    
    * commit '4a213147dbe60416aa26ebdba0f3c631b2e2b013':
      Added support for parsing XMF versions 1.00 and 1.01 headers
    Jean-Baptiste Queru authored Android Git Automerger committed
  2. am 274d057: Merge "Added support for parsing XMF versions 1.00 and 1.…

    …01 headers"
    
    * commit '274d0571979c10a8c0bfe2641ada32a310248f13':
      Added support for parsing XMF versions 1.00 and 1.01 headers
    Jean-Baptiste Queru authored Android Git Automerger committed
  3. Merge "Added support for parsing XMF versions 1.00 and 1.01 headers"

    Jean-Baptiste Queru authored android code review committed
  4. Added support for parsing XMF versions 1.00 and 1.01 headers

    The parser will parse only parse file type and revision level when
    parsing XMF version 2.00 headers.
    XMF versions 1.00 and 1.01 doesn't support file type and revision
    level in the headers.
    
    Change-Id: I883c9e78179fac45db4ab3c4e3d0cbbb2df4899b
    Andreas Lillvik authored Kenneth Andersson committed

Aug 15, 2012

  1. am 0eb1fab: am 09a0c67: Merge "There is fd leak in sonivox lib when t…

    …ry open any media file > 2GB (MIDI parser memory leak)"
    
    * commit '0eb1fab72466cd5900470d0a4a2b191722aa9ef5':
      There is fd leak in sonivox lib when try open any media file > 2GB (MIDI parser memory leak)
    Jean-Baptiste Queru authored Android Git Automerger committed
  2. am 09a0c67: Merge "There is fd leak in sonivox lib when try open any …

    …media file > 2GB (MIDI parser memory leak)"
    
    * commit '09a0c67023c010aec72faa71f116199da4b0f39e':
      There is fd leak in sonivox lib when try open any media file > 2GB (MIDI parser memory leak)
    Jean-Baptiste Queru authored Android Git Automerger committed
  3. Merge "There is fd leak in sonivox lib when try open any media file >…

    … 2GB (MIDI parser memory leak)"
    Jean-Baptiste Queru authored android code review committed

Aug 14, 2012

  1. There is fd leak in sonivox lib when try open any media file

    > 2GB (MIDI parser memory leak)
    
    Midi Parser support only 32 bit file operations and thus files
    of size less than 2 GB. When file open is called on the Midi
    parser, for files more than 2GB, internal seek operation fails
    resulting in the non-closure of the opened file. This resulted
    in the memory leak of the opened file descriptor. This is
    fixed by closing the opened file descriptor on failed cases.
    
    Change-Id: Ie9f53275206e2b4616d1cfc41c12b90544895548
    Author: Muthukumar Kandasamy <muthukumar.kandasamy@intel.com>
    Signed-off-by: Muthukumar Kandasamy <muthukumar.kandasamy@intel.com>
    Signed-off-by: Gurudatta Bhakte <gurudattax.bhakte@intel.com>
    Singed-off-by: Shuo Gao <shuo.gao@intel.com>
    Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
    Signed-off-by: Jack Ren <jack.ren@intel.com>
    Author-tracking-BZ: 39292
    gbhakteX authored Shuo Gao committed

Aug 10, 2012

  1. Split out LOCAL_ASFLAGS

    Bug: 6967574
    Change-Id: If114d72b49e1c5aca24c1d92caded7cf8630671d
    Ying Wang authored

May 15, 2012

  1. Remove obsolete ThirdPartyProject.prop file.

    Change-Id: I9252bc176a7ac4300d2c1b9e0394638aa773783d
    Elliott Hughes authored

Dec 16, 2011

  1. Fix crash when scanning corrupt midi file.

    b/5453816
    
    Change-Id: Ic2104fc0b86ef0b5ec3af7a009b193f85690d291
    Marco Nelissen authored

Jan 30, 2011

  1. am d868ec6: Reconcile gingerbread-plus-aosp and honeycomb

    * commit 'd868ec62e3db6f843d5857b2294d2b695b49ed59':
    The Android Open Source Project authored Android Git Automerger committed
  2. Reconcile gingerbread-plus-aosp and honeycomb

    Change-Id: I6f6c22bca861de934a539e680a256f4374dece63
    The Android Open Source Project authored
  3. Mass merge from gingerbread - do not merge

    Change-Id: I38bb9cc71b7b04cb3c71aa06561ed64c3b6a2ce4
    The Android Open Source Project authored

Jan 29, 2011

  1. am d029b23: Remove unused file.

    * commit 'd029b2378170cfd7bb34d894482065a762a54578':
      Remove unused file.
    Dan Bornstein authored Android Git Automerger committed

Jan 24, 2011

  1. am fbbe5ab: am 42196fd: am cdffe35: merge from gingerbread

    * commit 'fbbe5ab5255f68cc9f0f10f36f680719b82955b6':
    The Android Open Source Project authored Android Git Automerger committed
  2. am 7eaac43: am d2c550c: am d029b23: Remove unused file.

    * commit '7eaac4336c6feeabdb1bfdb390865571f73e9a51':
      Remove unused file.
    Dan Bornstein authored Android Git Automerger committed
  3. am 42196fd: am cdffe35: merge from gingerbread

    * commit '42196fd10398c7250af364c0563893d209c8cc15':
    The Android Open Source Project authored Android Git Automerger committed
  4. am d2c550c: am d029b23: Remove unused file.

    * commit 'd2c550cdd59acd54e5c831bcb20cc2ffad020a65':
      Remove unused file.
    Dan Bornstein authored Android Git Automerger committed

Jan 21, 2011

  1. am cdffe35: merge from gingerbread

    * commit 'cdffe35cb330587b942f7771efad385261a03c83':
    The Android Open Source Project authored Android Git Automerger committed
  2. merge from gingerbread

    Change-Id: I99e03b97ed48d1cc6cbd4176a55b1e06fc5ca5c1
    The Android Open Source Project authored
  3. am bc636d8: (-s ours) Remove unused file. DO NOT MERGE.

    * commit 'bc636d8fd6f3f9963e90af0cc5771c249f40084c':
      Remove unused file. DO NOT MERGE.
    Dan Bornstein authored Android Git Automerger committed
  4. Remove unused file. DO NOT MERGE.

    Change-Id: I1a5ee8e70ebfce7d289d0a71ec8af101187c1f21
    Dan Bornstein authored
  5. am d029b23: Remove unused file.

    * commit 'd029b2378170cfd7bb34d894482065a762a54578':
      Remove unused file.
    Dan Bornstein authored Android Git Automerger committed
  6. Remove unused file.

    Change-Id: Ib50474510f2a95e398e279f34630bdc15b43809c
    Dan Bornstein authored

Dec 22, 2010

  1. Fix engine state reporting.

    b/3290604
    
    Change-Id: If1d15499575b1448c6c1c735718c2269b87fae3e
    Marco Nelissen authored

Oct 19, 2010

  1. Add missing NOTICE files.

    Copy the NOTICE file from external/sonivox to external/sonivox/arm-wt-22k,
    where it will be picked up by the build system.
    
    Change-Id: Ieb1c6bbb510b6cc9c375c6250b70d9413aa511a7
    David Deephanphongs authored

Jul 16, 2010

  1. am 91f74c0: add meta-files about 3rd party projects

    Merge commit '91f74c003b47a98a9af1999fe0caeff1f9678d33' into gingerbread-plus-aosp
    
    * commit '91f74c003b47a98a9af1999fe0caeff1f9678d33':
      add meta-files about 3rd party projects
    The Android Open Source Project authored Android Git Automerger committed
  2. add meta-files about 3rd party projects

    Change-Id: Iad572add7a8d4764b41128e1f1806adb89c83692
    The Android Open Source Project authored

Jul 09, 2010

  1. merge from open-source master

    Change-Id: Id3bf2f86b2cac666dbb4bac69755ff5f8c270391
    The Android Open Source Project authored

Jun 25, 2010

  1. Fix missing NL

    Change-Id: I00dc89c1e9f0ac7f21707937619d3cdc364ca27d
    Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
    Bruce Beare authored

Mar 09, 2010

  1. Add an empty CleanSpec.mk

    Change-Id: I9634aed52bacd702362223bbfe29f59ff8c4fc3c
    Jean-Baptiste Queru authored
Something went wrong with that request. Please try again.