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

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

Snap for 4533842 from 06c82dd9 to pi-release 

Change-Id: Icbba694e1b88956163e296121e6bd5c247ef2124
parents 0ab4315d 06c82dd9

broadcastradio/2.0/types.hal

+4 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ enum ConfigFlag : uint32_t { 
     * Forces the digital playback for the supporting radio technology.

     *

     * User may disable digital-analog handover that happens with poor

     * receiption conditions. With digital forced, the radio will remain silent

     * reception conditions. With digital forced, the radio will remain silent

     * instead of switching to analog channel if it's available. This is purely

     * user choice, it does not reflect the actual state of handover.

     */
@@ -76,8 +76,9 @@ enum ConfigFlag : uint32_t { 
    /**

     * RDS Alternative Frequencies.

     *

     * If set, radio tuner automatically switches to the best available

     * frequency that currently listened RDS station broadcasts.

     * If set and the currently tuned RDS station broadcasts on multiple

     * channels, radio tuner automatically switches to the best available

     * alternative.

     */

    RDS_AF,

drm/1.0/default/CryptoPlugin.cpp

+3 −5
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ namespace implementation { 
        legacyPattern.mEncryptBlocks = pattern.encryptBlocks;

        legacyPattern.mSkipBlocks = pattern.skipBlocks;



        android::CryptoPlugin::SubSample *legacySubSamples =

            new android::CryptoPlugin::SubSample[subSamples.size()];

        std::unique_ptr<android::CryptoPlugin::SubSample[]> legacySubSamples =

                std::make_unique<android::CryptoPlugin::SubSample[]>(subSamples.size());



        for (size_t i = 0; i < subSamples.size(); i++) {

            legacySubSamples[i].mNumBytesOfClearData
@@ -145,11 +145,9 @@ namespace implementation { 
            destPtr = static_cast<void *>(handle);

        }

        ssize_t result = mLegacyPlugin->decrypt(secure, keyId.data(), iv.data(),

                legacyMode, legacyPattern, srcPtr, legacySubSamples,

                legacyMode, legacyPattern, srcPtr, legacySubSamples.get(),

                subSamples.size(), destPtr, &detailMessage);



        delete[] legacySubSamples;



        uint32_t status;

        uint32_t bytesWritten;

wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ class SupplicantHidlEnvironment : public ::testing::Environment { 
    virtual void SetUp() override {

        stopSupplicant();

    }

    virtual void TearDown() override {

    }

    virtual void TearDown() override { startSupplicantAndWaitForHidlService(); }

};



int main(int argc, char** argv) {

wifi/supplicant/1.1/vts/functional/VtsHalWifiSupplicantV1_1TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
class SupplicantHidlEnvironment : public ::testing::Environment {

   public:

    virtual void SetUp() override { stopSupplicant(); }

    virtual void TearDown() override {}

    virtual void TearDown() override { startSupplicantAndWaitForHidlService(); }

};



int main(int argc, char** argv) {