commit 7b1c067b90f6768c14516603528adf270fb3bc39
author Kenny Root <kroot@google.com> Wed Feb 17 13:24:59 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 17 13:24:59 2010 -0800
tree c2214b8c7dd443da42e50ff96a7509698e6720db
parent 574ecc8ed943d0c3148bff4fd7b28d65d9cc1cad
parent 7ae17760462e4c16ef0ea4289612c5950258d5da

Merge "Correct use of logical AND"

telephony/java/android/telephony/PhoneNumberUtils.java

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