Update to DP6

Change-Id: Ie6611041e2c159d81409dc33d3913e7fc9770651

BUILD_NUMBER

@@ -1 +1 @@
-OIR1.170720.017
+OIM1.171126.012

armeabi-v7a/include/boot_action/boot_action.h

@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#ifndef LIBANDROIDTHINGS_INCLUDE_BOOT_ACTION_BOOT_ACTION_H_
+#define LIBANDROIDTHINGS_INCLUDE_BOOT_ACTION_BOOT_ACTION_H_
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+/// A single boot action key/value parameter.
+///
+/// These parameters can be set when programmatically rebooting the device,
+/// and are passed into boot_action_init().
+typedef struct ABootActionParameter {
+  const char* key;
+  const char* value;
+} ABootActionParameter;
+
+__END_DECLS
+
+#endif  //  LIBANDROIDTHINGS_INCLUDE_BOOT_ACTION_BOOT_ACTION_H_

armeabi-v7a/include/pio/peripheral_manager_client.h

@@ -21,7 +21,6 @@
 
 #include "gpio.h"
 #include "i2c_device.h"
-#include "i2s_device.h"
 #include "pwm.h"
 #include "spi_device.h"
 #include "uart_device.h"
@@ -127,36 +126,9 @@ int APeripheralManagerClient_openUartDevice(
     const char* name,
     AUartDevice** dev);
 
-/// Returns the list of I2S buses.
-/// This does not take ownership into account.
-/// The list must be freed by the caller.
-/// @param client Pointer to the APeripheralManagerClient struct.
-/// @param num_i2s_buses Output pointer to the number of elements in the list.
-/// @return The list of I2S buses.
-char** APeripheralManagerClient_listI2sDevices(
-    const APeripheralManagerClient* client, int* num_i2s_buses);
-
-/// Opens an I2S device and takes ownership of it.
-/// @param client Pointer to the APeripheralManagerClient struct.
-/// @param name Name of the I2S device.
-/// @param encoding Device pcm encoding.
-/// @param channels Number of channels.
-/// @param rate Device rate in Hz.
-/// @param flags Specify device supporting input, output or both.
-/// @param dev Output pointer to the AI2sDevice struct. Empty on error.
-/// @return 0 on success, errno on error
-int APeripheralManagerClient_openI2sDevice(
-    const APeripheralManagerClient* client,
-    const char* name,
-    AI2sEncoding encoding,
-    int channels,
-    int rate,
-    int flags,
-    AI2sDevice** dev);
-
 /// Creates a new client.
 /// @return A pointer to the created client. nullptr on errors.
-APeripheralManagerClient* APeripheralManagerClient_new();
+APeripheralManagerClient* APeripheralManagerClient_new(void);
 
 /// Destroys the peripheral manager client.
 /// @param client Pointer to the APeripheralManagerClient struct.

x86/include/boot_action/boot_action.h

@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#ifndef LIBANDROIDTHINGS_INCLUDE_BOOT_ACTION_BOOT_ACTION_H_
+#define LIBANDROIDTHINGS_INCLUDE_BOOT_ACTION_BOOT_ACTION_H_
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+/// A single boot action key/value parameter.
+///
+/// These parameters can be set when programmatically rebooting the device,
+/// and are passed into boot_action_init().
+typedef struct ABootActionParameter {
+  const char* key;
+  const char* value;
+} ABootActionParameter;
+
+__END_DECLS
+
+#endif  //  LIBANDROIDTHINGS_INCLUDE_BOOT_ACTION_BOOT_ACTION_H_

x86/include/pio/peripheral_manager_client.h

@@ -21,7 +21,6 @@
 
 #include "gpio.h"
 #include "i2c_device.h"
-#include "i2s_device.h"
 #include "pwm.h"
 #include "spi_device.h"
 #include "uart_device.h"
@@ -127,36 +126,9 @@ int APeripheralManagerClient_openUartDevice(
     const char* name,
     AUartDevice** dev);
 
-/// Returns the list of I2S buses.
-/// This does not take ownership into account.
-/// The list must be freed by the caller.
-/// @param client Pointer to the APeripheralManagerClient struct.
-/// @param num_i2s_buses Output pointer to the number of elements in the list.
-/// @return The list of I2S buses.
-char** APeripheralManagerClient_listI2sDevices(
-    const APeripheralManagerClient* client, int* num_i2s_buses);
-
-/// Opens an I2S device and takes ownership of it.
-/// @param client Pointer to the APeripheralManagerClient struct.
-/// @param name Name of the I2S device.
-/// @param encoding Device pcm encoding.
-/// @param channels Number of channels.
-/// @param rate Device rate in Hz.
-/// @param flags Specify device supporting input, output or both.
-/// @param dev Output pointer to the AI2sDevice struct. Empty on error.
-/// @return 0 on success, errno on error
-int APeripheralManagerClient_openI2sDevice(
-    const APeripheralManagerClient* client,
-    const char* name,
-    AI2sEncoding encoding,
-    int channels,
-    int rate,
-    int flags,
-    AI2sDevice** dev);
-
 /// Creates a new client.
 /// @return A pointer to the created client. nullptr on errors.
-APeripheralManagerClient* APeripheralManagerClient_new();
+APeripheralManagerClient* APeripheralManagerClient_new(void);
 
 /// Destroys the peripheral manager client.
 /// @param client Pointer to the APeripheralManagerClient struct.