Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba6c79f3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4706961 from 9d8d52b6 to pi-release 

Change-Id: I55dd1198a5c1b1b6941d893d10f82cac955f1459
parents 526bb8ab 9d8d52b6

data/etc/android.software.device_id_attestation.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Feature for devices with Keymaster that support Device ID attestation. -->

<permissions>

    <feature name="android.software.device_id_attestation" />

</permissions>

libs/gui/BufferHubProducer.cpp

+0 −6
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ using namespace dvr; 


/* static */

sp<BufferHubProducer> BufferHubProducer::Create(const std::shared_ptr<ProducerQueue>& queue) {

    if (queue->metadata_size() != sizeof(DvrNativeBufferMetadata)) {

        ALOGE("BufferHubProducer::Create producer's metadata size is different "

              "than the size of DvrNativeBufferMetadata");

        return nullptr;

    }



    sp<BufferHubProducer> producer = new BufferHubProducer;

    producer->queue_ = queue;

    return producer;

libs/gui/BufferQueue.cpp

+1 −2
Original line number Diff line number Diff line
@@ -113,8 +113,7 @@ void BufferQueue::createBufferHubQueue(sp<IGraphicBufferProducer>* outProducer, 


    dvr::ProducerQueueConfigBuilder configBuilder;

    std::shared_ptr<dvr::ProducerQueue> producerQueue =

            dvr::ProducerQueue::Create(configBuilder.SetMetadata<DvrNativeBufferMetadata>().Build(),

                                       dvr::UsagePolicy{});

            dvr::ProducerQueue::Create(configBuilder.Build(), dvr::UsagePolicy{});

    LOG_ALWAYS_FATAL_IF(producerQueue == NULL, "BufferQueue: failed to create ProducerQueue.");



    std::shared_ptr<dvr::ConsumerQueue> consumerQueue = producerQueue->CreateConsumerQueue();

libs/gui/SurfaceComposerClient.cpp

+10 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ void ComposerService::composerServiceDied() 
SurfaceComposerClient::Transaction::Transaction(const Transaction& other) :

    mForceSynchronous(other.mForceSynchronous),

    mTransactionNestCount(other.mTransactionNestCount),

    mAnimation(other.mAnimation) {

    mAnimation(other.mAnimation),

    mEarlyWakeup(other.mEarlyWakeup) {

    mDisplayStates = other.mDisplayStates;

    mComposerStates = other.mComposerStates;

}
@@ -157,9 +158,13 @@ status_t SurfaceComposerClient::Transaction::apply(bool synchronous) { 
    if (mAnimation) {

        flags |= ISurfaceComposer::eAnimation;

    }

    if (mEarlyWakeup) {

        flags |= ISurfaceComposer::eEarlyWakeup;

    }



    mForceSynchronous = false;

    mAnimation = false;

    mEarlyWakeup = false;



    sf->setTransactionState(composerStates, displayStates, flags);

    mStatus = NO_ERROR;
@@ -185,6 +190,10 @@ void SurfaceComposerClient::Transaction::setAnimationTransaction() { 
    mAnimation = true;

}



void SurfaceComposerClient::Transaction::setEarlyWakeup() {

    mEarlyWakeup = true;

}



layer_state_t* SurfaceComposerClient::Transaction::getLayerState(const sp<SurfaceControl>& sc) {

    if (mComposerStates.count(sc) == 0) {

        // we don't have it, add an initialized layer_state to our list

libs/gui/include/gui/ISurfaceComposer.h

+5 −0
Original line number Diff line number Diff line
@@ -61,6 +61,11 @@ public: 
    enum {

        eSynchronous = 0x01,

        eAnimation   = 0x02,



        // Indicates that this transaction will likely result in a lot of layers being composed, and

        // thus, SurfaceFlinger should wake-up earlier to avoid missing frame deadlines. In this

        // case SurfaceFlinger will wake up at (sf vsync offset - debug.sf.early_phase_offset_ns)

        eEarlyWakeup = 0x04

    };



    enum {