diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-03 14:04:24 -0800 |
|---|---|---|
| committer | Alex Ray <aray@google.com> | 2013-07-30 13:56:49 -0700 |
| commit | 7aa707a5d654b7af67b133955c454c8e23a12abc (patch) | |
| tree | bf445487740866dcc015ab85001f00573db0fc7e /include/utils | |
| parent | c739660fb7c06a845f829a86302bd4a91641318f (diff) | |
| download | system_core-7aa707a5d654b7af67b133955c454c8e23a12abc.zip system_core-7aa707a5d654b7af67b133955c454c8e23a12abc.tar.gz system_core-7aa707a5d654b7af67b133955c454c8e23a12abc.tar.bz2 | |
auto import from //depot/cupcake/@132589
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/ResourceTypes.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 7d3fcf2..d83a33c 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -1101,22 +1101,16 @@ struct ResTable_config return false; } - // Return true if 'this' can be considered a match for the parameters in + // Return true if 'this' can be considered a match for the parameters in // 'settings'. - // Note this is asymetric. A default piece of data will match every request - // but a request for the default should not match odd specifics - // (ie, request with no mcc should not match a particular mcc's data) - // settings is the requested settings inline bool match(const ResTable_config& settings) const { if (imsi != 0) { - if ((settings.mcc != 0 && mcc != 0 - && mcc != settings.mcc) || - (settings.mcc == 0 && mcc != 0)) { + if (settings.mcc != 0 && mcc != 0 + && mcc != settings.mcc) { return false; } - if ((settings.mnc != 0 && mnc != 0 - && mnc != settings.mnc) || - (settings.mnc == 0 && mnc != 0)) { + if (settings.mnc != 0 && mnc != 0 + && mnc != settings.mnc) { return false; } } |