Merge "hammerhead: read bluetooth address using bdAddrLoader"
diff --git a/bdAddrLoader/Android.mk b/bdAddrLoader/Android.mk
new file mode 100644
index 0000000..3cf3917
--- /dev/null
+++ b/bdAddrLoader/Android.mk
@@ -0,0 +1,25 @@
+#
+# Copyright 2013 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.
+#
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := addrloader.c
+LOCAL_SHARED_LIBRARIES := libcutils liblog
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := lge
+LOCAL_MODULE := bdAddrLoader
+include $(BUILD_EXECUTABLE)
diff --git a/bdAddrLoader/NOTICE b/bdAddrLoader/NOTICE
new file mode 100644
index 0000000..faed58a
--- /dev/null
+++ b/bdAddrLoader/NOTICE
@@ -0,0 +1,190 @@
+
+ Copyright (c) 2005-2013, 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.
+
+ 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.
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
diff --git a/bdAddrLoader/addrloader.c b/bdAddrLoader/addrloader.c
new file mode 100644
index 0000000..48b0f99
--- /dev/null
+++ b/bdAddrLoader/addrloader.c
@@ -0,0 +1,285 @@
+/*
+ * Copyright 2013 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.
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <getopt.h>
+
+#define LOG_TAG "bdAddrLoader"
+
+#include <cutils/log.h>
+#include <cutils/properties.h>
+
+#define FILE_PATH_MAX 100
+#define BD_ADDR_LEN 6
+#define BD_ADDR_STR_LEN 18
+
+
+#define ARG_TYPE_PATH_FILE 0x11
+#define ARG_TYPE_PATH_PROP 0x12
+
+#define ARG_TYPE_DATA_HEX 0x21
+#define ARG_TYPE_DATA_ASCII 0x22
+
+typedef struct _ArgEl {
+ const char *szSrc; // Source Path
+ int nPathType; // Type of Source Path
+ int nDataType; // Type of Data
+} ArgEl;
+
+typedef ArgEl InArg;
+
+#define DEFAULT_BDADDR_PROP "persist.service.bdroid.bdaddr"
+
+typedef struct _OutArg {
+ ArgEl dest;
+ char cSeperator; // a character to be used for sperating like ':' of "XX:XX:XX:XX:XX:XX"
+ char bPrintOut; // Print out bd addr in standard out or not
+} OutArg;
+
+typedef struct _LoadedData {
+ union {
+ unsigned char bin[BD_ADDR_LEN];
+ char sz[BD_ADDR_STR_LEN];
+ }data;
+ int nDataType;
+} LoadedBDAddr;
+
+typedef enum _res {
+ SUCCESS = 0,
+ FAIL
+} Res;
+
+int hexa_to_ascii(const unsigned char* hexa, char* ascii, int nHexLen)
+{
+ int i, j;
+ char hex_table[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+ 'A', 'B', 'C', 'D', 'E', 'F'};
+
+ for (i = 0, j = 0; i <nHexLen; i++, j += 2) {
+ ascii[j] = hex_table[hexa[i] >> 4];
+ ascii[j + 1] = hex_table[hexa[i] & 0x0F];
+ }
+
+ ascii[nHexLen*2] = '\0';
+
+ ALOGI("hex_to_ascii() - converted Data (%s)", ascii);
+
+ return SUCCESS;
+}
+
+int readBDAddrData(const char* szFilePath, unsigned char* addrData, int nDataLen)
+{
+ int nFd, nRdCnt;
+
+ nFd = open(szFilePath, O_RDONLY);
+
+ if (nFd < 0) {
+ ALOGW("There is no Address File in FTM area : %s\n", szFilePath);
+ return FAIL;
+ }
+
+ nRdCnt = read(nFd, addrData, nDataLen);
+ if (nRdCnt != nDataLen) {
+ ALOGE("Fail to read Address data from FTM area\n");
+ close(nFd);
+ return FAIL;
+ }
+ close(nFd);
+ return SUCCESS;
+}
+
+void formattingBdAddr(char *szBDAddr, const char cSep)
+{
+ int i = 1, j = 0;
+ int pos = 0;
+ for (i=1; i<BD_ADDR_LEN; i++) {
+ pos = strlen(szBDAddr);
+ for (j=0; j<(BD_ADDR_LEN*2)-i*2; j++) {
+ szBDAddr[pos-j] = szBDAddr[pos-j-1];
+ }
+ szBDAddr[pos-j]=cSep;
+ }
+}
+
+int readBDAddr(InArg inArg, LoadedBDAddr *loadedBDAddr)
+{
+ Res res = FAIL;
+ unsigned char addrData[BD_ADDR_LEN] = {0,};
+ int nDataLen = 0;
+
+ ALOGI("Read From %s by Path type(0x%2x), Data type (0x%2x)",
+ inArg.szSrc, inArg.nPathType, inArg.nDataType);
+
+ if (inArg.nPathType == ARG_TYPE_PATH_FILE) {
+ switch (inArg.nDataType) {
+ case ARG_TYPE_DATA_HEX:
+ if (!readBDAddrData(inArg.szSrc, loadedBDAddr->data.bin, BD_ADDR_LEN)) {
+ loadedBDAddr->nDataType = ARG_TYPE_DATA_HEX;
+ return SUCCESS;
+ }
+ break;
+ case ARG_TYPE_DATA_ASCII:
+ if (!readBDAddrData(inArg.szSrc, (unsigned char *)loadedBDAddr->data.sz, BD_ADDR_STR_LEN)) {
+ loadedBDAddr->nDataType = ARG_TYPE_DATA_ASCII;
+ return SUCCESS;
+ }
+ break;
+ default:
+ return FAIL;
+ }
+ } else if (inArg.nPathType == ARG_TYPE_PATH_PROP) {
+ switch (inArg.nDataType) {
+ case ARG_TYPE_DATA_HEX:
+ if (property_get(inArg.szSrc, (char *)loadedBDAddr->data.bin, "") >= 0) {
+ loadedBDAddr->nDataType = ARG_TYPE_DATA_HEX;
+ return SUCCESS;
+ }
+ break;
+ case ARG_TYPE_DATA_ASCII:
+ if (property_get(inArg.szSrc, loadedBDAddr->data.sz, "") >= 0) {
+ loadedBDAddr->nDataType = ARG_TYPE_DATA_ASCII;
+ return SUCCESS;
+ }
+ break;
+ default:
+ return FAIL;
+ }
+ } else {
+ ALOGE("Error invalid argument : (%d)", inArg.nPathType);
+ }
+
+ ALOGE("Fail to read BDAddr from %s", inArg.szSrc);
+ return FAIL;
+}
+
+int writeBDAddr(OutArg outArg, LoadedBDAddr *loadedBDAddr)
+{
+ char szTmp[BD_ADDR_STR_LEN] = {0,};
+
+ ALOGI("Output Data type(0x%2x), bPrintout(%d), bPath(%s)",
+ outArg.dest.nDataType, outArg.bPrintOut, outArg.dest.szSrc);
+
+ ALOGI("Loaded Data type(0x%2x)", loadedBDAddr->nDataType);
+
+ if (outArg.dest.nDataType == ARG_TYPE_DATA_ASCII
+ && loadedBDAddr->nDataType == ARG_TYPE_DATA_HEX) {
+ if (!hexa_to_ascii(loadedBDAddr->data.bin, szTmp, BD_ADDR_LEN)) {
+ memcpy(loadedBDAddr->data.sz, szTmp, BD_ADDR_STR_LEN);
+ loadedBDAddr->nDataType = ARG_TYPE_DATA_ASCII;
+ } else {
+ ALOGE("Fail to convert data");
+ return FAIL;
+ }
+ }
+
+ if (loadedBDAddr->nDataType == ARG_TYPE_DATA_ASCII) {
+ // check out which addr data is already formated
+ if (strchr(loadedBDAddr->data.sz, '.') == NULL
+ && strchr(loadedBDAddr->data.sz, ':') == NULL) {
+ formattingBdAddr(loadedBDAddr->data.sz, outArg.cSeperator);
+ }
+ }
+ // print out szBDAddr
+ if (outArg.bPrintOut
+ && loadedBDAddr->nDataType == ARG_TYPE_DATA_ASCII
+ && strlen(loadedBDAddr->data.sz)==(BD_ADDR_STR_LEN-1)) {
+ printf("%s",loadedBDAddr->data.sz);
+ if (property_set(DEFAULT_BDADDR_PROP, loadedBDAddr->data.sz) < 0)
+ ALOGE("Failed to set address in prop %s", DEFAULT_BDADDR_PROP);
+ } else {
+ ALOGE("Invalid Data is loaded : %s", loadedBDAddr->data.sz);
+ return FAIL;
+ }
+ // TODO :: writing File or Property
+ return SUCCESS;
+}
+
+int main(int argc, char *argv[])
+{
+ int nFd, nRdCnt;
+ int c;
+
+ InArg inArg;
+ OutArg outArg;
+ LoadedBDAddr loadedBDAddr;
+
+ //initialize arg
+ memset(&inArg, 0, sizeof(InArg));
+ memset(&outArg, 0, sizeof(OutArg));
+ memset(&loadedBDAddr, 0, sizeof(LoadedBDAddr));
+
+ //load args;
+ while((c=getopt(argc, argv, ":f:p:hsx")) != -1){
+ switch(c){
+ case 'f': // input path
+ if (optarg != NULL) {
+ ALOGI("option : f=%s", optarg);
+ inArg.szSrc = optarg;
+ } else {
+ ALOGW("Invalid Argument(%s) of input path", optarg);
+ }
+ inArg.nPathType = ARG_TYPE_PATH_FILE;
+ break;
+ case 'p': // output path
+ if (optarg != NULL) {
+ ALOGI("option : p=%s", optarg);
+ inArg.szSrc = optarg;
+ } else {
+ ALOGW("Invalid Argument(%s) of out Path", optarg);
+ }
+ inArg.nPathType = ARG_TYPE_PATH_PROP;
+ break;
+ case 'h': // data type to be read is hex
+ ALOGI("option : h");
+ inArg.nDataType = ARG_TYPE_DATA_HEX;
+ break;
+ case 's': // data type to be read is ascii
+ ALOGI("option : s");
+ inArg.nDataType = ARG_TYPE_DATA_ASCII;
+ break;
+ case 'x':
+ ALOGI("option : x");
+ outArg.bPrintOut = 1; //true
+ break;
+ default:
+ ALOGW("Unknown option : %c", c);
+ break;
+ }
+ }
+
+ // setting up Arguments with default value
+ outArg.cSeperator = ':';
+ outArg.dest.nDataType = ARG_TYPE_DATA_ASCII;
+
+ // load bd addr and print out bd addr in formated ascii
+ if (readBDAddr(inArg, &loadedBDAddr)) {
+ ALOGE("Fail to load data !!");
+ return FAIL;
+ }
+
+ if (writeBDAddr(outArg, &loadedBDAddr)) {
+ ALOGE("Fail to write data !!");
+ return FAIL;
+ }
+
+ return 1;
+}
diff --git a/device.mk b/device.mk
index 7531181..9957c0f 100644
--- a/device.mk
+++ b/device.mk
@@ -179,6 +179,9 @@
charger \
charger_res_images
+PRODUCT_PACKAGES += \
+ bdAddrLoader
+
PRODUCT_PROPERTY_OVERRIDES += \
ro.opengles.version=196608
diff --git a/init.hammerhead.rc b/init.hammerhead.rc
index 56aece4..eb230e7 100644
--- a/init.hammerhead.rc
+++ b/init.hammerhead.rc
@@ -314,6 +314,12 @@
user camera
group camera system inet input
+service bdAddrLoader /system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x
+ class main
+ user bluetooth
+ group system bluetooth
+ oneshot
+
# bugreport is triggered by holding down volume down, volume up and power
service bugreport /system/bin/dumpstate -d -p -B \
-o /data/data/com.android.shell/files/bugreports/bugreport
