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

* commit 'c86ea5e260a70f7c48890da702f86466d587904e':
  Removing repetitive conditional; it simply does nothing except slowing down things.
This commit is contained in:
Brad Fitzpatrick
2011-03-15 11:43:03 -07:00
committed by Android Git Automerger

View File

@@ -763,8 +763,7 @@ public 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);