diff options
| author | Brian Carlstrom <bdc@google.com> | 2016-02-08 20:29:37 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2016-02-08 20:29:37 -0800 |
| commit | e2be51cba62b5a2a4f1e5a5d5ad75c64c87b989b (patch) | |
| tree | 45808c0edf3cc1318d92d6583c5ab71965e82052 | |
| parent | f1f6a525677ae4cf9175dad9e6702ce57e1fbffe (diff) | |
| download | base-e2be51cba62b5a2a4f1e5a5d5ad75c64c87b989b.tar.gz | |
Revert "New unit test for GsmCdmaPhone and fixes for some existing tests"
This reverts commit a57aed75dc5d8546afd8b88eab11cc5591068b69, reversing
changes made to eaa22b28cdb10244865e8d163c19ff27d0c9c5e2.
| -rw-r--r-- | src/java/android/telephony/SmsMessage.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/java/android/telephony/SmsMessage.java b/src/java/android/telephony/SmsMessage.java index 71ebd7dfdc04..3323078e032d 100644 --- a/src/java/android/telephony/SmsMessage.java +++ b/src/java/android/telephony/SmsMessage.java @@ -786,16 +786,14 @@ public class SmsMessage { Binder.restoreCallingIdentity(identity); } - if (!TextUtils.isEmpty(simOperator)) { - for (NoEmsSupportConfig currentConfig : mNoEmsSupportConfigList) { - if (simOperator.startsWith(currentConfig.mOperatorNumber) && - (TextUtils.isEmpty(currentConfig.mGid1) || - (!TextUtils.isEmpty(currentConfig.mGid1) && - currentConfig.mGid1.equalsIgnoreCase(gid)))) { - return false; - } + for (NoEmsSupportConfig currentConfig : mNoEmsSupportConfigList) { + if (simOperator.startsWith(currentConfig.mOperatorNumber) && + (TextUtils.isEmpty(currentConfig.mGid1) || + (!TextUtils.isEmpty(currentConfig.mGid1) + && currentConfig.mGid1.equalsIgnoreCase(gid)))) { + return false; } - } + } return true; } |