Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24ab9633 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6529526 from e5508107 to rvc-release 

Change-Id: I5d89d88f279b97d89f75572db26c142a8751467d
parents 6f159c96 e5508107

proto/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -4,7 +4,10 @@ java_library_static { 
    proto: {

        type: "lite",

    },

    srcs: ["bluetooth/metrics/bluetooth.proto"],

    srcs: [

        "bluetooth/metrics/bluetooth.proto",

        "bluetooth/bluetoothKeystore/keystore.proto",

    ],

}



cc_library_static {
@@ -14,5 +17,8 @@ cc_library_static { 
        export_proto_headers: true,

        type: "lite",

    },

    srcs: ["bluetooth/metrics/bluetooth.proto"],

    srcs: [

        "bluetooth/metrics/bluetooth.proto",

        "bluetooth/bluetoothKeystore/keystore.proto",

    ],

}

proto/bluetooth/bluetoothKeystore/keystore.proto

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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.

 */



syntax = "proto2";



option optimize_for = LITE_RUNTIME;



// C++ namespace: bluetooth::metrics::BluetoothMetricsProto

package bluetooth.keystore.BluetoothKeystoreProto;



option java_package = "com.android.bluetooth";

option java_outer_classname = "BluetoothKeystoreProto";



// Holds encrypted, authenticated data.

message EncryptedData {

  // The initialization vector used during encryption.

  optional bytes init_vector = 1;

  // MAC of (init_vector + encrypted_data).

  optional bytes authentication_data = 2;

  optional bytes encrypted_data = 3;

}

system/btif/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ cc_library_static { 
        "src/btif_storage.cc",

        "src/btif_uid.cc",

        "src/btif_util.cc",

        "src/btif_keystore.cc",

        "src/stack_manager.cc",

    ],

    header_libs: [

system/btif/include/btif_api.h

+18 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ bool is_restricted_mode(void); 


/*******************************************************************************

 *

 * Function         is_single_user_mode_

 * Function         is_niap_mode_

 *

 * Description      Checks if BT was enabled in single user mode. In this

 *                  mode, use of keystore for key attestation of LTK is limitee
@@ -114,7 +114,23 @@ bool is_restricted_mode(void); 
 * Returns          bool

 *

 ******************************************************************************/

bool is_single_user_mode(void);

bool is_niap_mode(void);



/*******************************************************************************

 *

 * Function         get_niap_config_compare_result

 *

 * Description      Get the niap config compare result for confirming the config

 *                  checksum compare result. When the niap mode doesn't enable,

 *                  it should be all pass (0b11).

 *                  Bit define:

 *                    CONFIG_FILE_COMPARE_PASS = 0b01

 *                    CONFIG_BACKUP_COMPARE_PASS = 0b10

 *

 * Returns          int

 *

 ******************************************************************************/

int get_niap_config_compare_result(void);



/*******************************************************************************

 *

system/btif/include/btif_keystore.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2020 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 <hardware/bt_keystore.h>



namespace bluetooth {

namespace bluetooth_keystore {



BluetoothKeystoreInterface* getBluetoothKeystoreInterface();



}  // namespace bluetooth_keystore

}  // namespace bluetooth
 
 No newline at end of file