Merge "Remove permission check in registerAdapter" into jb-mr1-dev

Matthew Xie · Android (Google) Code Review · commit 5e1c74dbbe1c · 2012-09-25T21:04:15.000-07:00
diff --git a/services/java/com/android/server/BluetoothManagerService.java b/services/java/com/android/server/BluetoothManagerService.java
@@ -218,8 +218,6 @@ private void storeNameAndAddress(String name, String address) {
     }
 
     public IBluetooth registerAdapter(IBluetoothManagerCallback callback){
-        mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM,
-                                                "Need BLUETOOTH permission");
         Message msg = mHandler.obtainMessage(MESSAGE_REGISTER_ADAPTER);
         msg.obj = callback;
         mHandler.sendMessage(msg);

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,6 @@ private void storeNameAndAddress(String name, String address) {`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`public IBluetooth registerAdapter(IBluetoothManagerCallback callback){`
`221`		`- mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM,`
`222`		`- "Need BLUETOOTH permission");`
`223`	`221`	`Message msg = mHandler.obtainMessage(MESSAGE_REGISTER_ADAPTER);`
`224`	`222`	`msg.obj = callback;`
`225`	`223`	`mHandler.sendMessage(msg);`