Revert ""DO NOT MERGE" Add write SMS protection"

This reverts commit 8c837f3f7f1d311366053a80cc6d42762c3d8888.

Change-Id: I95ae24a87fa8b81901b93be4b9b3c8b55db90aff

2 files changed, 1 insertions, 6 deletions

diff --git a/src/com/android/bluetooth/map/BluetoothMapContentObserver.java b/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
index 1981eac26..d768ebb76 100644
--- a/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
+++ b/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
@@ -1176,7 +1176,7 @@ public class BluetoothMapContentObserver {
                 Log.e(TAG, "Wrong mime type!!!", e);
             }
 
-            mContext.registerReceiver(this, intentFilter, Manifest.permission.WRITE_SMS, handler);
+            mContext.registerReceiver(this, intentFilter, null, handler);
         }
 
         public void unregister() {
diff --git a/src/com/android/bluetooth/map/BluetoothMapService.java b/src/com/android/bluetooth/map/BluetoothMapService.java
index cb0a0b55f..d7d6a6178 100644
--- a/src/com/android/bluetooth/map/BluetoothMapService.java
+++ b/src/com/android/bluetooth/map/BluetoothMapService.java
@@ -38,7 +38,6 @@ import android.bluetooth.BluetoothMap;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 import android.content.Intent;
-import android.Manifest;
 import android.os.Handler;
 import android.os.Message;
 import android.os.PowerManager;
@@ -426,10 +425,6 @@ public class BluetoothMapService extends ProfileService {
         filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
         try {
             registerReceiver(mMapReceiver, filter);
-            // We need WRITE_SMS permission to handle messages in
-            // actionMessageSentDisconnected()
-            registerReceiver(mMapReceiver, filterMessageSent,
-                             Manifest.permission.WRITE_SMS, null);
         } catch (Exception e) {
             Log.w(TAG,"Unable to register map receiver",e);
         }