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

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

Snap for 4600820 from fd0c5b1a to pi-release 

Change-Id: Ic1dcbeea35ec5613dd421915e78acc1fb4f93eaf
parents 7cbb4a5a fd0c5b1a

cmds/installd/otapreopt_parameters.cpp

+12 −3
Original line number Diff line number Diff line
@@ -218,6 +218,9 @@ bool OTAPreoptParameters::ReadArgumentsV1(const char** argv) { 
    // Set the profile name to the primary apk profile.

    profile_name = "primary.prof";



    // By default we don't have a dex metadata file.

    dex_metadata_path = nullptr;



    return true;

}
@@ -272,6 +275,9 @@ bool OTAPreoptParameters::ReadArgumentsPostV1(uint32_t version, const char** arg 
    // Set the profile name to the primary apk profile.

    profile_name = "primary.prof";



    // By default we don't have a dex metadata file.

    dex_metadata_path = nullptr;



    for (size_t param_index = 0; param_index < num_args_actual; ++param_index) {

        const char* param = argv[dexopt_index + 1 + param_index];

        switch (param_index) {
@@ -333,10 +339,13 @@ bool OTAPreoptParameters::ReadArgumentsPostV1(uint32_t version, const char** arg 


            case 14:

                dex_metadata_path = ParseNull(param);

                break;



            default:

                CHECK(false) << "Should not get here. Did you call ReadArguments "

                        << "with the right expectation?";

                LOG(FATAL) << "Should not get here. Did you call ReadArguments "

                        << "with the right expectation? index=" << param_index

                        << " num_args=" << num_args_actual;

                return false;

        }

    }

cmds/installd/tests/installd_otapreopt_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ static const char* ParseNull(const char* arg) { 
class OTAPreoptTest : public testing::Test {

protected:

    virtual void SetUp() {

        setenv("ANDROID_LOG_TAGS", "*:v", 1);

        android::base::InitLogging(nullptr);

        setenv("ANDROID_LOG_TAGS", "*:f", 1);

        android::base::InitLogging(nullptr, android::base::StderrLogger);

    }



    void verifyPackageParameters(const OTAPreoptParameters& params,
@@ -68,7 +68,7 @@ protected: 
        if (version > 1) {

            ASSERT_STREQ(params.se_info, ParseNull(args[i++]));

        } else {

            ASSERT_STREQ(params.se_info, nullptr);

            ASSERT_EQ(params.se_info, nullptr);

        }

        if (version > 2) {

            ASSERT_EQ(params.downgrade, ParseBool(args[i++]));
@@ -88,7 +88,7 @@ protected: 
        if (version > 5) {

            ASSERT_STREQ(params.dex_metadata_path, ParseNull(args[i++]));

        } else {

            ASSERT_STREQ(params.dex_metadata_path, nullptr);

            ASSERT_EQ(params.dex_metadata_path, nullptr);

        }

    }

headers/media_plugin/media/drm/DrmAPI.h

+3 −0
Original line number Diff line number Diff line
@@ -148,6 +148,9 @@ namespace android { 
        enum SecurityLevel {

            // Failure to access security level, an error occurred

            kSecurityLevelUnknown,

            // The maximum security level of the device. This is the default when

            // a session is opened if no security level is specified

            kSecurityLevelMax,

            // Software-based whitebox crypto

            kSecurityLevelSwSecureCrypto,

            // Software-based whitebox crypto and an obfuscated decoder

libs/gui/BufferQueueProducer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1121,6 +1121,9 @@ int BufferQueueProducer::query(int what, int *outValue) { 
        case NATIVE_WINDOW_CONSUMER_IS_PROTECTED:

            value = static_cast<int32_t>(mCore->mConsumerIsProtected);

            break;

        case NATIVE_WINDOW_MAX_BUFFER_COUNT:

            value = static_cast<int32_t>(mCore->mMaxBufferCount);

            break;

        default:

            return BAD_VALUE;

    }

libs/nativewindow/include/system/window.h

+5 −0
Original line number Diff line number Diff line
@@ -184,6 +184,11 @@ enum { 
     * Returns data space for the buffers.

     */

    NATIVE_WINDOW_DATASPACE = 20,



    /*

     * Returns maxBufferCount set by BufferQueueConsumer

     */

    NATIVE_WINDOW_MAX_BUFFER_COUNT = 21,

};



/* Valid operations for the (*perform)() hook.