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

View File

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