diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 11:43:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 11:43:08 -0700 |
| commit | d927e2742871dec1cf9a8d861a24d5bcc73c542e (patch) | |
| tree | e33bf2cc8fec5288c9d7eb9068b743cdca902e1c /telephony | |
| parent | 6f80f395b71cb641b77097e14a1906c7842c9ba6 (diff) | |
| parent | b7d573e901e07fc249df0bc531cf94c574107556 (diff) | |
| download | frameworks_base-d927e2742871dec1cf9a8d861a24d5bcc73c542e.zip frameworks_base-d927e2742871dec1cf9a8d861a24d5bcc73c542e.tar.gz frameworks_base-d927e2742871dec1cf9a8d861a24d5bcc73c542e.tar.bz2 | |
am b7d573e9: am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
* commit 'b7d573e901e07fc249df0bc531cf94c574107556':
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 1617374..3f521a0 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -565,8 +565,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); |