commit 38d7ab4c5c1eeca78c5871f3c4e7e0319dd9175c
author Daisuke Miyakawa <dmiyakawa@google.com> Tue Sep 27 19:00:07 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 27 19:00:08 2011 -0700
tree 2e40d05c80cefc6256c75b20b12b9343f4526415
parent 31c1d5c529c2e578c04fafde521a976f56fb6d23
parent 91758d0483042d2e007f075703a3342346285c14

Merge "Have a logic to disable "prohibited phone number" rule" into ics-factoryrom

src/com/android/contacts/dialpad/DialpadFragment.java

diff --git a/src/com/android/contacts/dialpad/DialpadFragment.java b/src/com/android/contacts/dialpad/DialpadFragment.java
index 412ceff..e9fbbbb 100644
--- a/src/com/android/contacts/dialpad/DialpadFragment.java
+++ b/src/com/android/contacts/dialpad/DialpadFragment.java
@@ -44,6 +44,7 @@
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.SystemProperties;
 import android.provider.Contacts.Intents.Insert;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Phones;
@@ -882,9 +883,13 @@
         } else {
             final String number = mDigits.getText().toString();
 
+            // "persist.radio.otaspdial" is a temporary hack needed for one carrier's automated
+            // test equipment.
+            // TODO: clean it up.
             if (number != null
                     && !TextUtils.isEmpty(mProhibitedPhoneNumberRegexp)
-                    && number.matches(mProhibitedPhoneNumberRegexp)) {
+                    && number.matches(mProhibitedPhoneNumberRegexp)
+                    && (SystemProperties.getInt("persist.radio.otaspdial", 0) != 1)) {
                 Log.i(TAG, "The phone number is prohibited explicitly by a rule.");
                 if (getActivity() != null) {
                     DialogFragment dialogFragment = CallProhibitedDialogFragment.newInstance();