summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-02-17 13:24:59 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-17 13:24:59 -0800
commit7b1c067b90f6768c14516603528adf270fb3bc39 (patch)
treec2214b8c7dd443da42e50ff96a7509698e6720db /telephony
parent574ecc8ed943d0c3148bff4fd7b28d65d9cc1cad (diff)
parent7ae17760462e4c16ef0ea4289612c5950258d5da (diff)
downloadframeworks_base-7b1c067b90f6768c14516603528adf270fb3bc39.zip
frameworks_base-7b1c067b90f6768c14516603528adf270fb3bc39.tar.gz
frameworks_base-7b1c067b90f6768c14516603528adf270fb3bc39.tar.bz2
Merge "Correct use of logical AND"
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/PhoneNumberUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index 586f63f..6797f78 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -1654,7 +1654,7 @@ public class PhoneNumberUtils
if (DBG) log("processPlusCodeWithinNanp,networkDialStr=" + networkDialStr);
// If there is a plus sign at the beginning of the dial string,
// Convert the plus sign to the default IDP since it's an international number
- if (networkDialStr != null &
+ if (networkDialStr != null &&
networkDialStr.charAt(0) == PLUS_SIGN_CHAR &&
networkDialStr.length() > 1) {
String newStr = networkDialStr.substring(1);