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.
This commit is contained in:
Brad Fitzpatrick
2011-03-15 11:33:28 -07:00
committed by Android Git Automerger

View File

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