diff options
| author | Johan Redestig <johan.redestig@sonyericsson.com> | 2010-11-09 14:13:31 +0100 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2011-02-05 21:34:28 -0500 |
| commit | 43f95d5de1be9c2036662186fe8fca90256850ed (patch) | |
| tree | 7fb6ed03a41b7327edb8cf37f11d74b340d5c1f4 /tools | |
| parent | 2d364c6f42b011d208296d30fcf49443b6a49647 (diff) | |
| download | frameworks_base-43f95d5de1be9c2036662186fe8fca90256850ed.zip frameworks_base-43f95d5de1be9c2036662186fe8fca90256850ed.tar.gz frameworks_base-43f95d5de1be9c2036662186fe8fca90256850ed.tar.bz2 | |
Make AaptGroupEntry::getMncName accept mnc00
MNC 00 is a valid network code and is used by
some operators, see http://en.wikipedia.org/wiki/Mobile_Network_Code.
Remove the test that checks if atoi returns zero.
The string is validated to contain only numbers
already.
Also discussed here:
https://code.google.com/p/android/issues/detail?id=3657
Change-Id: I3220d7980abe4067c9e7aa4cbc10b5fd0b8c9ea7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index e4f447e..2b2ec7b 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/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; } /* |