OSDN Git Service

[DO NOT MERGE] btif/osi: move I/O to OSI layer. disable for multi-user.
authorMartin Brabham <optedoblivion@google.com>
Fri, 22 Mar 2019 21:43:24 +0000 (14:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Mar 2019 21:43:24 +0000 (14:43 -0700)
am: e689266be5

Change-Id: I29d03a2bd2b43ca4f120444c42f3f836de8f727f

1  2 
btif/src/btif_config.cc
osi/src/config.cc

  #define FILE_TIMESTAMP "TimeCreated"
  #define FILE_SOURCE "FileSource"
  #define TIME_STRING_LENGTH sizeof("YYYY-MM-DD HH:MM:SS")
+ #define DISABLED "disabled"
  static const char* TIME_STRING_FORMAT = "%Y-%m-%d %H:%M:%S";
  
 +#define BT_CONFIG_METRICS_SECTION "Metrics"
 +#define BT_CONFIG_METRICS_SALT_256BIT "Salt256Bit"
 +using bluetooth::common::AddressObfuscator;
  constexpr int kBufferSize = 400 * 10;  // initial file is ~400B
  
+ static bool use_key_attestation() { return getuid() == AID_BLUETOOTH; }
  using bluetooth::BtifKeystore;
  
  // TODO(armansito): Find a better way than searching by a hardcoded path.
@@@ -17,8 -17,9 +17,8 @@@
   ******************************************************************************/
  
  #include "osi/include/config.h"
 -#include "log/log.h"
  
- #include <base/files/file_path.h>
+ #include <base/files/file_util.h>
  #include <base/logging.h>
  #include <ctype.h>
  #include <errno.h>