From e11bd2f97b8e14b2d196e9a5ddf0b81207d37b4b Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Tue, 14 Jun 2016 10:48:49 -0700 Subject: Revert ""DO NOT MERGE" Add write SMS protection" CYNGNOS-3020 This reverts commit 15e2d38086db1419c3072a509e02ca62a6446825. Change-Id: Ic7bde784cd961f41f3df5dfe1d2bac483553ab80 --- src/com/android/bluetooth/map/BluetoothMapContentObserver.java | 2 +- src/com/android/bluetooth/map/BluetoothMapService.java | 5 ----- 2 files changed, 1 insertion(+), 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); } -- cgit v1.2.3