Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Upstream Changes. #1

Open
wants to merge 10 commits into
base: own-n
Choose a base branch
from
Open

Merge Upstream Changes. #1

wants to merge 10 commits into from

Commits on Jun 15, 2017

  1. fix race condition that can cause a use after free

    Backported from 12a0ccd6f7201bac706d903ac3f436c4358fe203.
    
    Bug: 33004354
    Test: manual
    Change-Id: I9b38ee644b02268c9b995a330db758aa2e568399
    (cherry picked from commit 59485525a6047453e6ba16c03989381e2a0d56ec)
    pixelflinger authored and android-build-team Robot committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    17e5eec View commit details
    Browse the repository at this point in the history
  2. Merge cherrypicks of [2413849, 2413760, 2413901, 2413776, 2413658, 24…

    …13792, 2413850, 2413851, 2413793, 2413866, 2413738, 2413659, 2413660, 2413867, 2413868, 2413885, 2413829, 2413814, 2413886, 2413921, 2413777, 2413887, 2413854, 2413889, 2413890, 2413855, 2413869, 2413740, 2413816, 2413831, 2413832, 2413817, 2413892, 2413797, 2413779] into nyc-mr2-pixel-monthly-release
    
    Change-Id: Ibdc8a041b91966025cb8dd8398903f789803cd25
    android-build-team Robot committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    5abe359 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2017

  1. surfaceflinger: Fix continuous SF dump.

    - Pass false in dumpdrawCycle() to append
      SF dumps for each draw cycle in a file.
    
    Change-Id: Ibea496635b0d5a63e963f01754b5b6ddf8b09b4c
    CRs-Fixed: 1099278
    Namit Solanki authored and arco committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    db0e94b View commit details
    Browse the repository at this point in the history
  2. sf: Limit co-ordinates difference fix for high res panel

    - Limit co-ordinate difference fix for high res panel as this
      is causing pixel shift on low res panel due to rounding.
    
    Change-Id: I1d697bc76ff6f962f399f6f692e347d04a059443
    Baldev Sahu authored and arco committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    0adab82 View commit details
    Browse the repository at this point in the history
  3. sf: Fix GPU coordinates computation.

    Along with Viewport, final crop need to be
    considered to maintain aspect ratio.
    
    CRs-Fixed: 2001126
    Change-Id: Ia499cc059a2b0ef65002c60215d2f01ac706867f
    Pullakavi Srinivas authored and arco committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    96d3138 View commit details
    Browse the repository at this point in the history
  4. surfaceflinger: Validate setposition parameters

    Validate setposition parameters width and height to
    fix hang issues becuase of wrong values set by clients.
    
    Change-Id: I786fc6f986fdb1d7de46ac3845f6a77cdcf34f93
    CRs-Fixed: 2005153
    Ramakant Singh authored and arco committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    a3b93a7 View commit details
    Browse the repository at this point in the history
  5. Surface: Ensure synchronisation of copyBlt

    The Surface::lock() function has an optimisation for copying the
    previously drawn contents from the frontbuffer to the (current)
    backbuffer, so that the client does not have to redraw the whole surface
    contents. This logic was not using the sync fence FD from
    dequeueBuffer() and so was not correctly synchronised with pending
    operations on the backbuffer.
    
    Change-Id: Ib44574d50f8bdb4a23078cd8da1c5c512c876320
    Francis Hart authored and arco committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    c8aefcf View commit details
    Browse the repository at this point in the history
  6. Surface: Use async lock/unlock in copyBlt

    The Surface::lock() function now uses the asynchronous versions of
    gralloc lock/unlock when copying the previously drawn content to the
    backbuffer. This allows for optimisations in the gralloc module
    implementation and so can improve performance and avoid CPU waits.
    
    Change-Id: I57193f327db2ff0422e1b58b3484f613201d994c
    Francis Hart authored and arco committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    d461e7a View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2017

  1. Merge tag 'android-7.1.2_r29' into cm-14.1

    Android 7.1.2 Release 29 (NJH47F)
    
    # gpg: Signature made Fri 28 Jul 2017 01:56:01 PM CDT
    # gpg:                using DSA key E8AD3F819AB10E78
    # gpg: Can't check signature: No public key
    invisiblek committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    99f5e57 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2017

  1. Configuration menu
    Copy the full SHA
    e86907d View commit details
    Browse the repository at this point in the history