Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"

Browse Source 
* commit 'bbb5a5ce1922a168335811b177cd7341350c15cc':
  Make AaptGroupEntry::getMncName accept mnc00
This commit is contained in:
Dianne Hackborn
2011-01-29 14:59:02 -08:00
committed by Android Git Automerger
parent 87d197597c bbb5a5ce19
commit 2107757dde
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aapt/AaptAssets.cpp
View File

@@ -685,13 +685,11 @@ bool AaptGroupEntry::getMncName(const char* name,
if (*c != 0) return false; if (*c != 0) return false;
if (c-val == 0 || c-val > 3) return false; if (c-val == 0 || c-val > 3) return false;
int d = atoi(val); if (out) {
if (d != 0) { out->mnc = atoi(val);
if (out) out->mnc = d;
return true;
} }
return false; return true;
} }
/* /*