Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
am: a841973dee

* commit 'a841973deea9281bbb21035055918c0b0cb3230f':
  Declare new interface for headset client bluetooth profile to query.
diff --git a/Android.mk b/Android.mk
index 99e0c46..f7bd9a1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -117,6 +117,7 @@
 	core/java/android/bluetooth/IBluetoothSap.aidl \
 	core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
 	core/java/android/bluetooth/IBluetoothHeadsetClient.aidl \
+	core/java/android/bluetooth/IBluetoothHeadsetClientController.aidl \
 	core/java/android/bluetooth/IBluetoothGatt.aidl \
 	core/java/android/bluetooth/IBluetoothGattCallback.aidl \
 	core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \
diff --git a/core/java/android/bluetooth/IBluetoothHeadsetClientController.aidl b/core/java/android/bluetooth/IBluetoothHeadsetClientController.aidl
new file mode 100644
index 0000000..8f940f3
--- /dev/null
+++ b/core/java/android/bluetooth/IBluetoothHeadsetClientController.aidl
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package android.bluetooth;
+
+/**
+ * Controller to specify behavior of bluetooth headset client.
+ * @hide
+ */
+interface IBluetoothHeadsetClientController {
+    boolean allowAudioConnect();
+}