Snap for 6664824 from 1d4a59949e5c1e40d51c569a8f60ea0bf7b7e561 to mainline-release
Change-Id: I665fa3ef0046d8a7e5f95063e1e22c6ab6ae1a70
diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index 0cdb8bc..62e0f3f 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -43,6 +43,7 @@
import android.os.Bundle;
import android.os.Process;
import android.os.UserHandle;
+import android.provider.BlockedNumberContract;
import android.provider.Settings;
import android.telecom.Log;
import android.telecom.PhoneAccount;
@@ -1493,6 +1494,28 @@
}
@Override
+ public void stopBlockSuppression() {
+ try {
+ Log.startSession("TSI.sBS");
+ enforceModifyPermission();
+ if (Binder.getCallingUid() != Process.SHELL_UID
+ && Binder.getCallingUid() != Process.ROOT_UID) {
+ throw new SecurityException("Shell-only API.");
+ }
+ synchronized (mLock) {
+ long token = Binder.clearCallingIdentity();
+ try {
+ BlockedNumberContract.SystemContract.endBlockSuppression(mContext);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+ } finally {
+ Log.endSession();
+ }
+ }
+
+ @Override
public TelecomAnalytics dumpCallAnalytics() {
try {
Log.startSession("TSI.dCA");