Merge "Protect against adding a null config for the BT health profile"

            IBluetoothHealthCallback callback) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM,

                "Need BLUETOOTH permission");

        if (config == null) {

            Log.e(TAG, "Trying to use a null config for registration");

            return false;

        }

        if (mApps.get(config) != null) {

            if (DBG) Log.d(TAG, "Config has already been registered");

            return false;

package com.android.bluetooth.hdp;

import android.test.InstrumentationTestCase;

import junit.framework.Assert;

public class HealthServiceTest extends InstrumentationTestCase {

    public void testRegisterAppConfiguration() {

        HealthService testService = new HealthService();

        // Attach a context to the Health Service for permission checks

        testService.attach(getInstrumentation().getContext(), null, null, null, null, null);

        // Test registering a null config

        assertEquals(false, testService.registerAppConfiguration(null, null));

    }

}