diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 11:43:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 11:43:03 -0700 |
| commit | 6f80f395b71cb641b77097e14a1906c7842c9ba6 (patch) | |
| tree | 03320da7ff7f4579a547c6a677c1ead34064f061 /telephony | |
| parent | b81d7f833890498b6d5db9c16f32564cc88a4042 (diff) | |
| parent | c86ea5e260a70f7c48890da702f86466d587904e (diff) | |
| download | frameworks_base-6f80f395b71cb641b77097e14a1906c7842c9ba6.zip frameworks_base-6f80f395b71cb641b77097e14a1906c7842c9ba6.tar.gz frameworks_base-6f80f395b71cb641b77097e14a1906c7842c9ba6.tar.bz2 | |
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.
Diffstat (limited to 'telephony')
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index ca24fc1..4ab3834 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -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); |