commit 0592109a75ca9e4e65489c04d6c5994cd7db45b2
author Matthew Xie <mattx@google.com> Thu Apr 25 01:41:55 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 25 01:41:56 2013 +0000
tree 4ff8b594bb31c3af1fbf5a73c9878fe91c9b6453
parent 8629665794ef845e945595040e4cf1ea2fa508d3
parent 9e4a62e487bda885848771e4fa87717465bf75d2

Merge "Enforcing bluetooth permissions for GATT api calls" into jb-mr2-dev

src/com/android/bluetooth/a2dp/Avrcp.java

diff --git a/src/com/android/bluetooth/a2dp/Avrcp.java b/src/com/android/bluetooth/a2dp/Avrcp.java
index 0a5a69e..c2e8187 100755
--- a/src/com/android/bluetooth/a2dp/Avrcp.java
+++ b/src/com/android/bluetooth/a2dp/Avrcp.java
@@ -114,6 +114,8 @@
         mHandler = new AvrcpMessageHandler(looper);
         mRemoteControlDisplay = new IRemoteControlDisplayWeak(mHandler);
         mAudioManager.registerRemoteControlDisplay(mRemoteControlDisplay);
+        mAudioManager.remoteControlDisplayWantsPlaybackPositionSync(
+                      mRemoteControlDisplay, true);
     }
 
     static Avrcp make(Context context) {

src/com/android/bluetooth/hdp/HealthService.java

diff --git a/src/com/android/bluetooth/hdp/HealthService.java b/src/com/android/bluetooth/hdp/HealthService.java
old mode 100755
new mode 100644
index 291310b..b418dcb
--- a/src/com/android/bluetooth/hdp/HealthService.java
+++ b/src/com/android/bluetooth/hdp/HealthService.java
@@ -43,6 +43,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -55,7 +56,8 @@
  * @hide
  */
 public class HealthService extends ProfileService {
-    private static final boolean DBG = false;
+    private static final boolean DBG = true;
+    private static final boolean VDBG = false;
     private static final String TAG="HealthService";
 
     private List<HealthChannel> mHealthChannels;
@@ -108,14 +110,15 @@
     }
 
     private void cleanupApps(){
-        for (Entry<BluetoothHealthAppConfiguration, AppInfo> entry : mApps.entrySet()) {
-            try{
-                AppInfo appInfo = entry.getValue();
-                appInfo.cleanup();
-                mApps.remove(entry.getKey());
-            }catch(Exception e){
-                Log.e(TAG,"Failed to cleanup appInfo for appid ="+entry.getKey());
-            }
+        Iterator <Map.Entry<BluetoothHealthAppConfiguration,AppInfo>>it
+                    = mApps.entrySet().iterator();
+        while (it.hasNext())
+        {
+           Map.Entry<BluetoothHealthAppConfiguration,AppInfo> entry   = it.next();
+           AppInfo appInfo = entry.getValue();
+           if (appInfo != null)
+               appInfo.cleanup();
+           it.remove();
         }
     }
     protected boolean cleanup() {
@@ -144,6 +147,7 @@
 
         @Override
         public void handleMessage(Message msg) {
+            if (DBG) log("HealthService Handler msg: " + msg.what);
             switch (msg.what) {
                 case MESSAGE_REGISTER_APPLICATION:
                 {
@@ -153,7 +157,7 @@
                     if (appInfo == null) break;
                     int halRole = convertRoleToHal(appConfig.getRole());
                     int halChannelType = convertChannelTypeToHal(appConfig.getChannelType());
-                    if (DBG) log("register datatype: " + appConfig.getDataType() + " role: " +
+                    if (VDBG) log("register datatype: " + appConfig.getDataType() + " role: " +
                                  halRole + " name: " + appConfig.getName() + " channeltype: " +
                                  halChannelType);
                     int appId = registerHealthAppNative(appConfig.getDataType(), halRole,
@@ -237,17 +241,24 @@
                         appInfo.cleanup();
                         mApps.remove(appConfig);
                     }
-                }   
+                }
                     break;
                 case MESSAGE_CHANNEL_STATE_CALLBACK:
                 {
                     ChannelStateEvent channelStateEvent = (ChannelStateEvent) msg.obj;
                     HealthChannel chan = findChannelById(channelStateEvent.mChannelId);
+                    BluetoothHealthAppConfiguration appConfig =
+                            findAppConfigByAppId(channelStateEvent.mAppId);
                     int newState;
+                    newState = convertHalChannelState(channelStateEvent.mState);
+                    if (newState  ==  BluetoothHealth.STATE_CHANNEL_DISCONNECTED &&
+                        appConfig == null) {
+                        Log.e(TAG,"Disconnected for non existing app");
+                        break;
+                    }
                     if (chan == null) {
                         // incoming connection
-                        BluetoothHealthAppConfiguration appConfig =
-                            findAppConfigByAppId(channelStateEvent.mAppId);
+
                         BluetoothDevice device = getDevice(channelStateEvent.mAddr);
                         chan = new HealthChannel(device, appConfig, appConfig.getChannelType());
                         chan.mChannelId = channelStateEvent.mChannelId;
@@ -289,7 +300,7 @@
         }
 
         public void binderDied() {
-            Log.d(TAG,"Binder is dead.");
+            if (DBG) Log.d(TAG,"Binder is dead.");
             mService.unregisterAppConfiguration(mConfig);
         }
 
@@ -497,7 +508,7 @@
     }
 
     private void callStatusCallback(BluetoothHealthAppConfiguration config, int status) {
-        if (DBG) log ("Health Device Application: " + config + " State Change: status:" + status);
+        if (VDBG) log ("Health Device Application: " + config + " State Change: status:" + status);
         IBluetoothHealthCallback callback = (mApps.get(config)).mCallback;
         if (callback == null) {
             Log.e(TAG, "Callback object null");