commit c86ea5e260a70f7c48890da702f86466d587904e
author Brad Fitzpatrick <bradfitz@android.com> Tue Mar 15 11:33:28 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 15 11:33:28 2011 -0700
tree 864d8e48215171b3a4fece990e334c9dbafc9464
parent 33dd1bae6ef16ed1cdc4d9f82f0c608cc7601af6
parent 38c6e31c88dec226271e02fbfed675181ae938b7

am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."

* commit '38c6e31c88dec226271e02fbfed675181ae938b7':
  Removing repetitive conditional; it simply does nothing except slowing down things.

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

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 @@
                 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);