Snap for 11914274 from 0efbdb66887fef574c77307890dce7ee1cf4b468 to 24Q3-release (1746cfcb) · Commits · e / os / android_hardware_interfaces

common/aidl/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@ aidl_interface {
		vendor_available: true,
		product_available: true,
		double_loadable: true,
		vndk_use_version: "2",
		srcs: [
		"android/hardware/common/*.aidl",
		],

graphics/allocator/aidl/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ aidl_interface {
		name: "android.hardware.graphics.allocator",
		vendor_available: true,
		double_loadable: true,
		vndk_use_version: "2",
		srcs: ["android/hardware/graphics/allocator/*.aidl"],
		imports: [
		"android.hardware.common-V2",

graphics/common/aidl/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@ aidl_interface {
		host_supported: true,
		vendor_available: true,
		double_loadable: true,
		vndk_use_version: "5",
		srcs: [
		"android/hardware/graphics/common/*.aidl",
		],

graphics/composer/aidl/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ aidl_interface {
		vendor_available: true,
		double_loadable: true,
		frozen: true,
		vndk_use_version: "1",
		srcs: [
		"android/hardware/graphics/composer3/*.aidl",
		],

security/keymint/aidl/vts/functional/AttestKeyTest.cpp

+0 −55

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		#define LOG_TAG "keymint_1_attest_key_test"
		#include <android-base/logging.h>
		#include <android-base/strings.h>
		#include <cutils/log.h>
		#include <cutils/properties.h>

		@@ -29,66 +28,12 @@
		namespace aidl::android::hardware::security::keymint::test {

		namespace {
		string TELEPHONY_CMD_GET_IMEI = "cmd phone get-imei ";

		bool IsSelfSigned(const vector<Certificate>& chain) {
		if (chain.size() != 1) return false;
		return ChainSignaturesAreValid(chain);
		}

		/*
		* Run a shell command and collect the output of it. If any error, set an empty string as the
		* output.
		*/
		string exec_command(string command) {
		char buffer[128];
		string result = "";

		FILE* pipe = popen(command.c_str(), "r");
		if (!pipe) {
		LOG(ERROR) << "popen failed.";
		return result;
		}

		// read till end of process:
		while (!feof(pipe)) {
		if (fgets(buffer, 128, pipe) != NULL) {
		result += buffer;
		}
		}

		pclose(pipe);
		return result;
		}

		/*
		* Get IMEI using Telephony service shell command. If any error while executing the command
		* then empty string will be returned as output.
		*/
		string get_imei(int slot) {
		string cmd = TELEPHONY_CMD_GET_IMEI + std::to_string(slot);
		string output = exec_command(cmd);

		if (output.empty()) {
		LOG(ERROR) << "Command failed. Cmd: " << cmd;
		return "";
		}

		vector<string> out = ::android::base::Tokenize(::android::base::Trim(output), "Device IMEI:");

		if (out.size() != 1) {
		LOG(ERROR) << "Error in parsing the command output. Cmd: " << cmd;
		return "";
		}

		string imei = ::android::base::Trim(out[0]);
		if (imei.compare("null") == 0) {
		LOG(WARNING) << "Failed to get IMEI from Telephony service: value is null. Cmd: " << cmd;
		return "";
		}

		return imei;
		}
		} // namespace

		class AttestKeyTest : public KeyMintAidlTestBase {