diff options
author | Kenny Root <kroot@google.com> | 2010-02-18 08:54:47 -0800 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2010-02-18 08:54:47 -0800 |
commit | fedfea24e7de98b4fde13d6f79e6db37d9f0e169 (patch) | |
tree | 4988eec3ace281fb48a5aec136bebc92b52a3aa6 /tools | |
parent | c948cc8c8a8a9a751d8252e390e5975d1a763d34 (diff) | |
download | frameworks_base-fedfea24e7de98b4fde13d6f79e6db37d9f0e169.zip frameworks_base-fedfea24e7de98b4fde13d6f79e6db37d9f0e169.tar.gz frameworks_base-fedfea24e7de98b4fde13d6f79e6db37d9f0e169.tar.bz2 |
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
Diffstat (limited to 'tools')
-rw-r--r-- | tools/aapt/AaptAssets.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 663a33a..dc442aa 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -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) { |