Merge changes Ic9411ea2,Ibbf1e978

# Copyright 2007 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.

#

# If you don't need to do a full clean build but would like to touch

# a file or delete some intermediate files, add a clean step to the end

# of the list.  These steps will only be run once, if they haven't been

# run before.

#

# E.g.:

#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)

#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)

#

# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with

# files that are missing or have been moved.

#

# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.

# Use $(OUT_DIR) to refer to the "out" directory.

#

# If you need to re-do something that's already mentioned, just copy

# the command and add it to the bottom of the list.  E.g., if a change

# that you made last week required touching a file and a change you

# made today requires touching the same file, just copy the old

# touch step and add it to the end of the list.

#

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

# For example:

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)

#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)

#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)

# Start of Clean Step list:

$(call add-clean-step, find $(OUT_DIR) -type f -iname "*blue*" -print0 | xargs -0 rm -f)

$(call add-clean-step, find $(OUT_DIR) -type f -iname "*bdroid*" -print0 | xargs -0 rm -f)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

# The entries in this file map a sparse set of log tag numbers to tag names.

# This is installed on the device, in /system/etc, and parsed by logcat.

#

# Tag numbers are decimal integers, from 0 to 2^31.  (Let's leave the

# negative values alone for now.)

#

# Tag names are one or more ASCII letters and numbers or underscores, i.e.

# "[A-Z][a-z][0-9]_".  Do not include spaces or punctuation (the former

# impacts log readability, the latter makes regex searches more annoying).

#

# Tag numbers and names are separated by whitespace.  Blank lines and lines

# starting with '#' are ignored.

#

# Optionally, after the tag names can be put a description for the value(s)

# of the tag. Description are in the format

#    (<name>|data type[|data unit])

# Multiple values are separated by commas.

#

# The data type is a number from the following values:

# 1: int

# 2: long

# 3: string

# 4: list

#

# The data unit is a number taken from the following list:

# 1: Number of objects

# 2: Number of bytes

# 3: Number of milliseconds

# 4: Number of allocations

# 5: Id

# 6: Percent

# Default value for data of type int/long is 2 (bytes).

#

# TODO: generate ".java" and ".h" files with integer constants from this file.

1010000 bt_hci_timeout (opcode|1)

1010001 bt_config_source (opcode|1)

1010002 bt_hci_unknown_type (hci_type|1)

#include "raw_address.h"

#include "stack/include/bt_octets.h"

#define BT_CONFIG_SOURCE_TAG_NUM 1010001

#define TEMPORARY_SECTION_CAPACITY 10000

#define INFO_SECTION "Info"

    return future_new_immediate(FUTURE_FAIL);

  }

  LOG_EVENT_INT(BT_IOT_CONFIG_SOURCE_TAG_NUM, device_iot_config_source);

  return future_new_immediate(FUTURE_SUCCESS);

}

#include "osi/include/config.h"

#include "osi/include/osi.h"

#define BT_IOT_CONFIG_SOURCE_TAG_NUM 1010003

#define PROPERTY_ENABLE_LOGGING \

  "persist.bluetooth.device_iot_config.enablelogging"

#define PROPERTY_FACTORY_RESET "persist.bluetooth.factoryreset"