am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index e4f447e72642670b38a82fd883f78ba9211a0482..2b2ec7b3e9a7c1c6ec458c4e5a60c279ebd106ba 100644 (file)
--- 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;
 }
 
 /*