commit 6fe02e3a7b76dc8769b23012d044346f89dea567
author Abhijith Shastry <ashastry@google.com> Mon Mar 07 18:11:42 2016 -0800
committer Abhijith Shastry <ashastry@google.com> Tue Mar 08 14:57:59 2016 -0800
tree c5d4965604caf3329e1a23b75f2208711125ad22
parent e8fb491bdf78294024d2013a4177d42b4358a859

Update blocked number provider so that emergency numbers are not blocked.

BUG: 27534486
Change-Id: Ie7a0ee11af94b5c89f2fbb6a14f09d775efc65a9

src/com/android/providers/blockednumber/BlockedNumberProvider.java

diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
index d4fcaa8..69337cd 100644
--- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java
+++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
@@ -40,6 +40,7 @@
 import android.provider.BlockedNumberContract.SystemContract;
 import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -326,6 +327,16 @@
         return res;
     }
 
+    private boolean isEmergencyNumber(String phoneNumber) {
+        if (TextUtils.isEmpty(phoneNumber)) {
+            return false;
+        }
+
+        final String e164Number = Utils.getE164Number(getContext(), phoneNumber, null);
+        return PhoneNumberUtils.isEmergencyNumber(phoneNumber)
+                || PhoneNumberUtils.isEmergencyNumber(e164Number);
+    }
+
     private boolean isBlocked(String phoneNumber) {
         if (TextUtils.isEmpty(phoneNumber)) {
             return false;
@@ -394,6 +405,9 @@
         if (getBlockSuppressionStatus().isSuppressed) {
             return false;
         }
+        if (isEmergencyNumber(phoneNumber)) {
+            return false;
+        }
         return isBlocked(phoneNumber);
     }
 

tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java

diff --git a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
index 8d58222..6839925 100644
--- a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
+++ b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
@@ -37,6 +37,7 @@
 import android.location.Country;
 import android.net.Uri;
 import android.os.PersistableBundle;
+import android.os.SystemProperties;
 import android.provider.BlockedNumberContract;
 import android.provider.BlockedNumberContract.BlockedNumbers;
 import android.provider.BlockedNumberContract.SystemContract;
@@ -45,7 +46,6 @@
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import junit.framework.Assert;
 
@@ -55,7 +55,7 @@
 /**
  * runtest --path packages/providers/BlockedNumberProvider/tests
  */
-@SmallTest
+@MediumTest
 public class BlockedNumberProviderTest extends AndroidTestCase {
     private MyMockContext mMockContext;
     private ContentResolver mResolver;
@@ -256,7 +256,6 @@
         }
     }
 
-    @MediumTest
     public void testBlockSuppressionAfterEmergencyContact() {
         int blockSuppressionSeconds = 1000;
         when(mMockContext.mCarrierConfigManager.getConfig())
@@ -303,7 +302,6 @@
                 mMockContext.mIntentsBroadcasted.get(0));
     }
 
-    @MediumTest
     public void testBlockSuppressionAfterEmergencyContact_invalidCarrierConfigDefaultValueUsed() {
         int invalidBlockSuppressionSeconds = 700000; // > 1 week
         when(mMockContext.mCarrierConfigManager.getConfig())
@@ -481,6 +479,14 @@
         assertIsBlocked(false, "abcdef@gmail.com");
     }
 
+    public void testEmergencyNumbersAreNotBlockedBySystem() {
+        String emergencyNumber = getEmergencyNumberFromSystemPropertiesOrDefault();
+        insert(cv(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, emergencyNumber));
+
+        assertIsBlocked(true, emergencyNumber);
+        assertFalse(SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber));
+    }
+
     private void assertIsBlocked(boolean expected, String phoneNumber) {
         assertEquals(expected, BlockedNumberContract.isBlocked(mMockContext, phoneNumber));
     }
@@ -525,4 +531,13 @@
                     c.getString(c.getColumnIndex(BlockedNumbers.COLUMN_E164_NUMBER)));
         }
     }
+
+    private String getEmergencyNumberFromSystemPropertiesOrDefault() {
+        String systemEmergencyNumbers = SystemProperties.get("ril.ecclist");
+        if (systemEmergencyNumbers == null) {
+            return "911";
+        } else {
+            return systemEmergencyNumbers.split(",")[0];
+        }
+    }
 }