Merge "Fix disagreement of client_id/app_data pointer semantic" am: d230bcf4b0 (fda1fc5f) · Commits · e / os / android_system_core

trusty/keymaster/legacy/trusty_keymaster_device.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -122,10 +122,10 @@ template <typename RequestType>
		void AddClientAndAppData(const keymaster_blob_t* client_id, const keymaster_blob_t* app_data,
		RequestType* request) {
		request->additional_params.Clear();
		if (client_id) {
		if (client_id && client_id->data_length > 0) {
		request->additional_params.push_back(TAG_APPLICATION_ID, *client_id);
		}
		if (app_data) {
		if (app_data && app_data->data_length > 0) {
		request->additional_params.push_back(TAG_APPLICATION_DATA, *app_data);
		}
		}