Merge "Bluetooth Auto-connect per user, fix multidevice connections"

3 files changed, 79 insertions, 0 deletions

diff --git a/car-lib/src/android/car/ICarBluetoothUserService.aidl b/car-lib/src/android/car/ICarBluetoothUserService.aidl
new file mode 100644
index 0000000000..b1f7a39c23
--- /dev/null
+++ b/car-lib/src/android/car/ICarBluetoothUserService.aidl
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2017 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.car;
+import android.bluetooth.BluetoothDevice;
+
+/** @hide */
+interface ICarBluetoothUserService {
+    // Bluetooth related APIs
+    void setupBluetoothConnectionProxy();
+    void closeBluetoothConnectionProxy();
+    boolean isBluetoothConnectionProxyAvailable(in int profile);
+    void bluetoothConnectToProfile(in int profile, in BluetoothDevice device);
+}
diff --git a/car-lib/src/android/car/ICarUserService.aidl b/car-lib/src/android/car/ICarUserService.aidl
new file mode 100644
index 0000000000..1c7211c7ce
--- /dev/null
+++ b/car-lib/src/android/car/ICarUserService.aidl
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2017 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.car;
+import android.car.ICarBluetoothUserService;
+
+/** @hide */
+interface ICarUserService {
+    ICarBluetoothUserService getBluetoothUserService();
+}
diff --git a/car-lib/src/android/car/settings/CarSettings.java b/car-lib/src/android/car/settings/CarSettings.java
index f3a5c1261d..69e9a1e2ce 100644
--- a/car-lib/src/android/car/settings/CarSettings.java
+++ b/car-lib/src/android/car/settings/CarSettings.java
@@ -137,4 +137,33 @@ public class CarSettings {
      * @hide
      */
     public static final int DEFAULT_GARAGE_MODE_MAINTENANCE_WINDOW = 10 * 60 * 1000; // 10 mins
+
+    /**
+     * @hide
+     */
+    public static final class Secure {
+
+        /**
+         * Key for a list of devices to automatically connect on Bluetooth A2dp/Avrcp profiles
+         *
+         * @hide
+         */
+        public static final String KEY_BLUETOOTH_AUTOCONNECT_MUSIC_DEVICES =
+                "android.car.BLUETOOTH_AUTOCONNECT_MUSIC_DEVICES";
+        /**
+         * Key for a list of devices to automatically connect on Bluetooth HFP & PBAP profiles
+         *
+         * @hide
+         */
+        public static final String KEY_BLUETOOTH_AUTOCONNECT_PHONE_DEVICES =
+                "android.car.BLUETOOTH_AUTOCONNECT_PHONE_DEVICES";
+        /**
+         * Key for a list of devices to automatically connect on Bluetooth MAP profile
+         *
+         * @hide
+         */
+        public static final String KEY_BLUETOOTH_AUTOCONNECT_MESSAGING_DEVICES =
+                "android.car.BLUETOOTH_AUTOCONNECT_MESSAGING_DEVICES";
+
+    }
 }