diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 11:13:01 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-03-15 11:13:01 -0700 |
| commit | 7972e382802348e7914c14507426af450aa7e30c (patch) | |
| tree | e709a3e216c783fbf9d5d5e097de53b725c7a101 /telephony | |
| parent | 38c6e31c88dec226271e02fbfed675181ae938b7 (diff) | |
| parent | c28480a1b44bb2eb40801b7fc9ff7e870aa9a3a8 (diff) | |
| download | frameworks_base-7972e382802348e7914c14507426af450aa7e30c.zip frameworks_base-7972e382802348e7914c14507426af450aa7e30c.tar.gz frameworks_base-7972e382802348e7914c14507426af450aa7e30c.tar.bz2 | |
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 6ddb312..18ef121 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -643,8 +643,7 @@ final class GsmServiceStateTracker 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); |