summaryrefslogtreecommitdiff
path: root/tools/aapt/AaptAssets.cpp
diff options
context:
space:
mode:
author Wink Saville <wink@google.com> 2013-07-30 12:24:39 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-07-30 12:24:39 -0700
commit9516ed4598948eea5623c57e443bce08c1f48ab6 (patch)
treeb894cffa03bb3fab7df76620f9056f1eb1ab47ce /tools/aapt/AaptAssets.cpp
parentf0589d8fc78f7994cd49c64485f51f446c499259 (diff)
parentcfc23ac688be9de1ecd2e659455ea1ebcceb63dc (diff)
am cfc23ac6: Merge "Add support for MNC=00"
* commit 'cfc23ac688be9de1ecd2e659455ea1ebcceb63dc': Add support for MNC=00
Diffstat (limited to 'tools/aapt/AaptAssets.cpp')
-rw-r--r--tools/aapt/AaptAssets.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 2149190b10be..3797b49cc32d 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -934,6 +934,9 @@ bool AaptGroupEntry::getMncName(const char* name,
if (out) {
out->mnc = atoi(val);
+ if (out->mnc == 0) {
+ out->mnc = ACONFIGURATION_MNC_ZERO;
+ }
}
return true;