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

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

release-request-b613f8ce-05b5-465e-b783-c1b87f3c1e95-for-git_oc-mr1-release-43... 

release-request-b613f8ce-05b5-465e-b783-c1b87f3c1e95-for-git_oc-mr1-release-4332123 snap-temp-L59300000101925107

Change-Id: Ifcee9823039146f51c7918653795bb6ca07fd3c3
parents 45bce64a 2de5e5d0

current.txt

+1 −0
Original line number Diff line number Diff line
@@ -244,5 +244,6 @@ a432d6d9200248dc2126827bcd6cdea31dd65eff39b939f64585d27d915a5857 android.hardwar 
86ba9c03978b79a742e990420bc5ced0673d25a939f82572996bef92621e2014 android.hardware.cas@1.0::IMediaCasService

503da837d1a67cbdb7c08a033e927e5430ae1b159d98bf72c6336b4dcc5e76f5 android.hardware.cas.native@1.0::types

619600109232ed64b827c8a11beed8070b1827ae464547d7aa146cf0473b4bca android.hardware.cas.native@1.0::IDescrambler

0a159f81359cd4f71bbe00972ee8403ea79351fb7c0cd48be72ebb3e424dbaef android.hardware.radio@1.0::types

f4945e397b5dea41bb64518dfde59be71245d8a125fd1e0acffeb57ac7b08fed android.hardware.thermal@1.1::IThermal

c8bc853546dd55584611def2a9fa1d99f657e3366c976d2f60fe6b8aa6d2cb87 android.hardware.thermal@1.1::IThermalCallback

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1774,7 +1774,7 @@ TEST_F(SigningOperationsTest, EcdsaNoDigestHugeData) { 
                                             .Authorization(TAG_NO_AUTH_REQUIRED)

                                             .EcdsaSigningKey(224)

                                             .Digest(Digest::NONE)));

    string message(64 * 1024, 'a');

    string message(2 * 1024, 'a');

    SignMessage(message, AuthorizationSetBuilder().Digest(Digest::NONE));

}
@@ -2607,7 +2607,7 @@ TEST_F(EncryptionOperationsTest, RsaNoPaddingTooLong) { 
}



/*

 * EncryptionOperationsTest.RsaNoPaddingTooLong

 * EncryptionOperationsTest.RsaNoPaddingTooLarge

 *

 * Verifies that raw RSA encryption of too-large (numerically) messages fails in the expected way.

 */
@@ -3907,7 +3907,7 @@ TEST_F(AddEntropyTest, AddEmptyEntropy) { 
 * Verifies that the addRngEntropy method doesn't blow up when given a largish amount of data.

 */

TEST_F(AddEntropyTest, AddLargeEntropy) {

    EXPECT_EQ(ErrorCode::OK, keymaster().addRngEntropy(HidlBuf(string(16 * 1024, 'a'))));

    EXPECT_EQ(ErrorCode::OK, keymaster().addRngEntropy(HidlBuf(string(2 * 1024, 'a'))));

}



typedef KeymasterHidlTest AttestationTest;

neuralnetworks/1.0/IDevice.hal

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


package android.hardware.neuralnetworks@1.0;



import IEvent;

import IPreparedModel;



interface IDevice {
@@ -25,7 +26,7 @@ interface IDevice { 


    getSupportedSubgraph(Model model) generates(vec<bool> supported);



    prepareModel(Model model) generates(IPreparedModel preparedModel);

    prepareModel(Model model, IEvent event) generates(IPreparedModel preparedModel);



    getStatus() generates(DeviceStatus status);

};

neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworksV1_0TargetTest.cpp

+11 −7
Original line number Diff line number Diff line
@@ -209,10 +209,14 @@ TEST_F(NeuralnetworksHidlTest, SimpleExecuteGraphTest) { 
    const uint32_t INPUT = 0;

    const uint32_t OUTPUT = 1;



    // prpeare request

    // prepare request

    Model model = createTestModel();

    sp<IPreparedModel> preparedModel = device->prepareModel(model);

    sp<Event> preparationEvent = new Event();

    ASSERT_NE(nullptr, preparationEvent.get());

    sp<IPreparedModel> preparedModel = device->prepareModel(model, preparationEvent);

    ASSERT_NE(nullptr, preparedModel.get());

    Event::Status preparationStatus = preparationEvent->wait();

    EXPECT_EQ(Event::Status::SUCCESS, preparationStatus);



    // prepare inputs

    uint32_t inputSize = static_cast<uint32_t>(inputData.size() * sizeof(float));
@@ -245,13 +249,13 @@ TEST_F(NeuralnetworksHidlTest, SimpleExecuteGraphTest) { 
    outputMemory->commit();



    // execute request

    sp<Event> event = sp<Event>(new Event());

    ASSERT_NE(nullptr, event.get());

    sp<Event> executionEvent = new Event();

    ASSERT_NE(nullptr, executionEvent.get());

    bool success = preparedModel->execute({.inputs = inputs, .outputs = outputs, .pools = pools},

                                          event);

                                          executionEvent);

    EXPECT_TRUE(success);

    Event::Status status = event->wait();

    EXPECT_EQ(Event::Status::SUCCESS, status);

    Event::Status executionStatus = executionEvent->wait();

    EXPECT_EQ(Event::Status::SUCCESS, executionStatus);



    // validate results { 1+5, 2+6, 3+7, 4+8 }

    outputMemory->read();

power/1.1/default/Android.bp

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
// Copyright (C) 2016 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.



cc_binary {

    proprietary: true,

    defaults: ["hidl_defaults"],

    relative_install_path: "hw",

    name: "android.hardware.power@1.1-service",

    init_rc: ["android.hardware.power@1.1-service.rc"],

    srcs: ["service.cpp" , "Power.cpp"],



    shared_libs: [

        "liblog",

        "libdl",

        "libutils",

        "libhardware",

        "libhidlbase",

        "libhidltransport",

        "android.hardware.power@1.0",

        "android.hardware.power@1.1",

    ],

}