diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 11:12:15 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-03-15 11:12:15 -0700 |
| commit | 38c6e31c88dec226271e02fbfed675181ae938b7 (patch) | |
| tree | 718763e5e46fcf56094c6bcc8a60fd00b9fe8819 | |
| parent | 29d75c9a10a1ff6d60e85a1931d042d3e24d9549 (diff) | |
| parent | 4a64ab84d2cb89c989fb06a668c040c62a6b9570 (diff) | |
| download | frameworks_base-38c6e31c88dec226271e02fbfed675181ae938b7.zip frameworks_base-38c6e31c88dec226271e02fbfed675181ae938b7.tar.gz frameworks_base-38c6e31c88dec226271e02fbfed675181ae938b7.tar.bz2 | |
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index d2a4bd8..5b6bc1f 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -674,8 +674,7 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { return; } - if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW && - err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) { + if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) { Log.e(LOG_TAG, "RIL implementation has returned an error where it must succeed", ar.exception); |