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

Commit a9dd6851 authored Oct 10, 2019 by Martin Brabham Committed by android-build-merger Oct 10, 2019

Revert "Confirm the presence of BT key when BT ON"

am: 8038c20d

Change-Id: Ic59f00cda7b9190d464de11e67490e9ce87d8fd7

parents afe43a51 8038c20d

system/btif/include/btif_keystore.h

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -59,14 +59,6 @@ class BtifKeystore {
	*/		*/
	std::string Decrypt(const std::string& input_filename);		std::string Decrypt(const std::string& input_filename);

	/**
	* Check for existence of keystore key.
	*
	* This key can be cleared if a user manually wipes bluetooth storage data
	* b/133214365
	*/
	bool DoesKeyExist();

	private:		private:
	std::unique_ptr<keystore::KeystoreClient> keystore_client_;		std::unique_ptr<keystore::KeystoreClient> keystore_client_;
	std::mutex api_mutex_;		std::mutex api_mutex_;

system/btif/src/btif_config.cc

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -183,9 +183,7 @@ static BtifKeystore btif_keystore(new keystore::KeystoreClientImpl);
	static future_t* init(void) {		static future_t* init(void) {
	std::unique_lock<std::recursive_mutex> lock(config_lock);		std::unique_lock<std::recursive_mutex> lock(config_lock);

	if (is_factory_reset() \|\|		if (is_factory_reset()) delete_config_files();
	(use_key_attestation() && !btif_keystore.DoesKeyExist()))
	delete_config_files();

	std::string file_source;		std::string file_source;

system/btif/src/btif_keystore.cc

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -98,8 +98,4 @@ KeyStoreNativeReturnCode BtifKeystore::GenerateKey(const std::string& name,
	&software_enforced_characteristics);		&software_enforced_characteristics);
	}		}

	bool BtifKeystore::DoesKeyExist() {
	return keystore_client_->doesKeyExist(kKeyStore);
	}

	} // namespace bluetooth		} // namespace bluetooth