From: Dianne Hackborn <hackbod@android.com>
Date: Sat, 29 Jan 2011 22:38:48 +0000 (-0800)
Subject: Merge "Make AaptGroupEntry::getMncName accept mnc00"
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/d21107ab35ee636ae9baaf34b5b7d6e86a90ac24?hp=bd7f1573aa57c6dcba9efa589054dfccb19a3539

Merge "Make AaptGroupEntry::getMncName accept mnc00"
---

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index e4f447e..2b2ec7b 100644
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -685,13 +685,11 @@ bool AaptGroupEntry::getMncName(const char* name,
     if (*c != 0) return false;
     if (c-val == 0 || c-val > 3) return false;
 
-    int d = atoi(val);
-    if (d != 0) {
-        if (out) out->mnc = d;
-        return true;
+    if (out) {
+        out->mnc = atoi(val);
     }
 
-    return false;
+    return true;
 }
 
 /*