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

Commit fedfea24 authored by Kenny Root's avatar Kenny Root
Browse files

Fix enum reference 

Was using argument that is set default to NULL as a shortcut to an
enum's value. Change it to reference to class directly to avoid a null
pointer dereference.

Change-Id: I16b8ee15af4f095f027113131d574b70768994b0
parent c948cc8c

tools/aapt/AaptAssets.cpp

+8 −8
Original line number Diff line number Diff line
@@ -938,17 +938,17 @@ bool AaptGroupEntry::getKeysHiddenName(const char* name, 
    uint8_t mask = 0;

    uint8_t value = 0;

    if (strcmp(name, kWildcardName) == 0) {

        mask = out->MASK_KEYSHIDDEN;

        value = out->KEYSHIDDEN_ANY;

        mask = ResTable_config::MASK_KEYSHIDDEN;

        value = ResTable_config::KEYSHIDDEN_ANY;

    } else if (strcmp(name, "keysexposed") == 0) {

        mask = out->MASK_KEYSHIDDEN;

        value = out->KEYSHIDDEN_NO;

        mask = ResTable_config::MASK_KEYSHIDDEN;

        value = ResTable_config::KEYSHIDDEN_NO;

    } else if (strcmp(name, "keyshidden") == 0) {

        mask = out->MASK_KEYSHIDDEN;

        value = out->KEYSHIDDEN_YES;

        mask = ResTable_config::MASK_KEYSHIDDEN;

        value = ResTable_config::KEYSHIDDEN_YES;

    } else if (strcmp(name, "keyssoft") == 0) {

        mask = out->MASK_KEYSHIDDEN;

        value = out->KEYSHIDDEN_SOFT;

        mask = ResTable_config::MASK_KEYSHIDDEN;

        value = ResTable_config::KEYSHIDDEN_SOFT;

    }



    if (mask != 0) {