Skip to content

Commit 1255019

Browse files
lazarkovpull[bot]
lazarkov
authored and
pull[bot]
committed
Rename media cluster commands & command arguments (#13195)
* Update xml & test yaml & zap file * Run zap regen script * Fix code references * Update command attributes in xml & yaml & zap files * Run zap regen script * Update code references * Update logic as tests are failing * Update xml, cpp and other files per comments * Run zap regen script * Restyle fix
1 parent 8b72c38 commit 1255019

File tree

127 files changed

+6254
-11810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+6254
-11810
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+167-207
Large diffs are not rendered by default.

‎examples/thermostat/thermostat-common/thermostat.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -12521,7 +12521,7 @@
1252112521
"enabled": 0,
1252212522
"commands": [
1252312523
{
12524-
"name": "NavigateTarget",
12524+
"name": "NavigateTargetRequest",
1252512525
"code": 0,
1252612526
"mfgCode": null,
1252712527
"source": "client",
@@ -13956,4 +13956,4 @@
1395613956
"deviceIdentifier": 769
1395713957
}
1395813958
]
13959-
}
13959+
}

‎examples/tv-app/android/include/application-basic/Application.h

+9-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@
2020

2121
#include <app-common/zap-generated/cluster-objects.h>
2222

23+
namespace chip {
24+
namespace app {
25+
namespace Clusters {
26+
namespace ApplicationBasic {
2327
struct Application
2428
{
25-
using ApplicationBasicStatus = chip::app::Clusters::ApplicationBasic::ApplicationBasicStatus;
29+
using ApplicationBasicStatus = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum;
2630
char vendorName[32] = "";
2731
char name[32] = "";
2832
char id[32] = "";
@@ -33,3 +37,7 @@ struct Application
3337
uint16_t allowedVendorList[32] = { 123, 456 };
3438
ApplicationBasicStatus status = ApplicationBasicStatus::kStopped;
3539
};
40+
} // namespace ApplicationBasic
41+
} // namespace Clusters
42+
} // namespace app
43+
} // namespace chip

‎examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ CHIP_ERROR ApplicationBasicManager::Init()
4343
return err;
4444
}
4545

46-
void ApplicationBasicManager::store(chip::EndpointId endpoint, Application * application)
46+
void ApplicationBasicManager::store(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::Application * application)
4747
{
4848
uint8_t bufferMemory[64];
4949
MutableByteSpan zclString(bufferMemory);
@@ -100,10 +100,10 @@ void ApplicationBasicManager::store(chip::EndpointId endpoint, Application * app
100100
}
101101
}
102102

103-
Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId endpoint)
103+
chip::app::Clusters::ApplicationBasic::Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId endpoint)
104104
{
105-
Application app = {};
106-
uint16_t size = static_cast<uint16_t>(sizeof(app.name));
105+
chip::app::Clusters::ApplicationBasic::Application app = {};
106+
uint16_t size = static_cast<uint16_t>(sizeof(app.name));
107107

108108
std::string section = "endpoint" + std::to_string(endpoint);
109109

@@ -147,7 +147,7 @@ Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId
147147
}
148148

149149
bool applicationBasicClusterChangeApplicationStatus(chip::EndpointId endpoint,
150-
app::Clusters::ApplicationBasic::ApplicationBasicStatus status)
150+
app::Clusters::ApplicationBasic::ApplicationStatusEnum status)
151151
{
152152
// TODO: Insert code here
153153
ChipLogProgress(Zcl, "Sent an application status change request %d for endpoint %d", to_underlying(status), endpoint);

‎examples/tv-app/android/include/application-basic/ApplicationBasicManager.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ class ApplicationBasicManager
2929
{
3030
public:
3131
CHIP_ERROR Init();
32-
void store(chip::EndpointId endpoint, Application * application);
33-
Application getApplicationForEndpoint(chip::EndpointId endpoint);
32+
void store(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::Application * application);
33+
chip::app::Clusters::ApplicationBasic::Application getApplicationForEndpoint(chip::EndpointId endpoint);
3434

3535
static ApplicationBasicManager & GetInstance()
3636
{

‎examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <app/clusters/application-launcher-server/application-launcher-server.h>
2323
#include <app/util/af.h>
2424
#include <app/util/basic-types.h>
25+
#include <utility>
2526

2627
using namespace std;
2728

@@ -43,41 +44,39 @@ CHIP_ERROR ApplicationLauncherManager::proxyGetApplicationList(chip::app::Attrib
4344
});
4445
}
4546

46-
ApplicationLauncherResponse applicationLauncherClusterLaunchApp(chip::EndpointId endpoint, ApplicationLauncherApp application,
47+
ApplicationLauncherResponse applicationLauncherClusterLaunchApp(chip::EndpointId endpoint, Application application,
4748
std::string data)
4849
{
4950
// TODO: Insert your code
5051
ApplicationLauncherResponse response;
5152
const char * testData = "data";
5253
response.data = (uint8_t *) testData;
53-
response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS;
54+
response.status = chip::to_underlying(chip::app::Clusters::ApplicationLauncher::StatusEnum::kSuccess);
5455
// TODO: Update once storing a structure attribute is supported
5556
// emberAfWriteServerAttribute(endpoint, ZCL_APPLICATION_LAUNCH_CLUSTER_ID, ZCL_APPLICATION_LAUNCHER_CURRENT_APP_APPLICATION_ID,
5657
// (uint8_t *) &application, ZCL_STRUCT_ATTRIBUTE_TYPE);
5758

5859
return response;
5960
}
6061

61-
ApplicationLauncherResponse applicationLauncherClusterStopApp(chip::EndpointId endpoint, ApplicationLauncherApp application,
62-
std::string data)
62+
ApplicationLauncherResponse applicationLauncherClusterStopApp(chip::EndpointId endpoint, Application application, std::string data)
6363
{
6464
ChipLogProgress(Zcl, "ApplicationLauncherManager::applicationLauncherClusterStopApp");
6565

6666
ApplicationLauncherResponse response;
6767
const char * testData = "data";
6868
response.data = (uint8_t *) testData;
69-
response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS;
69+
response.status = chip::to_underlying(chip::app::Clusters::ApplicationLauncher::StatusEnum::kSuccess);
7070
return response;
7171
}
7272

73-
ApplicationLauncherResponse applicationLauncherClusterHideApp(chip::EndpointId endpoint, ApplicationLauncherApp application,
74-
std::string data)
73+
ApplicationLauncherResponse applicationLauncherClusterHideApp(chip::EndpointId endpoint, Application application, std::string data)
7574
{
7675
ChipLogProgress(Zcl, "ApplicationLauncherManager::applicationLauncherClusterHideApp");
7776

7877
ApplicationLauncherResponse response;
7978
const char * testData = "data";
8079
response.data = (uint8_t *) testData;
81-
response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS;
80+
response.status = chip::to_underlying(chip::app::Clusters::ApplicationLauncher::StatusEnum::kSuccess);
8281
return response;
8382
}

‎examples/tv-app/android/include/audio-output/AudioOutputManager.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ CHIP_ERROR AudioOutputManager::proxyGetListOfAudioOutputInfo(chip::app::Attribut
4949

5050
for (int i = 0; i < maximumVectorSize; ++i)
5151
{
52-
chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::Type audioOutputInfo;
53-
audioOutputInfo.outputType = EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI;
54-
audioOutputInfo.name = chip::CharSpan(name, sizeof(name) - 1);
55-
audioOutputInfo.index = static_cast<uint8_t>(1 + i);
56-
ReturnErrorOnFailure(encoder.Encode(audioOutputInfo));
52+
chip::app::Clusters::AudioOutput::Structs::OutputInfo::Type outputInfo;
53+
outputInfo.outputType = chip::app::Clusters::AudioOutput::OutputTypeEnum::kHdmi;
54+
outputInfo.name = chip::CharSpan(name, sizeof(name) - 1);
55+
outputInfo.index = static_cast<uint8_t>(1 + i);
56+
ReturnErrorOnFailure(encoder.Encode(outputInfo));
5757
}
5858
return CHIP_NO_ERROR;
5959
});

‎examples/tv-app/android/include/cluster-init.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint)
6767
err = aManager.Init();
6868
if (CHIP_NO_ERROR == err)
6969
{
70-
Application application = aManager.getApplicationForEndpoint(endpoint);
70+
chip::app::Clusters::ApplicationBasic::Application application = aManager.getApplicationForEndpoint(endpoint);
7171
aManager.store(endpoint, &application);
7272
}
7373
else

‎examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ CHIP_ERROR TargetNavigatorManager::proxyGetTargetInfoList(chip::app::AttributeVa
4646

4747
for (int i = 0; i < maximumVectorSize; ++i)
4848
{
49-
chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::Type targetInfo;
49+
chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type targetInfo;
5050
targetInfo.name = chip::CharSpan(name, sizeof(name) - 1);
5151
targetInfo.identifier = static_cast<uint8_t>(1 + i);
5252
ReturnErrorOnFailure(encoder.Encode(targetInfo));
@@ -61,6 +61,6 @@ TargetNavigatorResponse targetNavigatorClusterNavigateTarget(chip::EndpointId en
6161
TargetNavigatorResponse response;
6262
const char * testData = "data response";
6363
response.data = (uint8_t *) testData;
64-
response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS;
64+
response.status = chip::to_underlying(chip::app::Clusters::TargetNavigator::StatusEnum::kSuccess);
6565
return response;
6666
}

‎examples/tv-app/android/java/ChannelManager.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ CHIP_ERROR ChannelManager::getChannelLineup(chip::app::AttributeValueEncoder & a
223223
VerifyOrExit(env != NULL, err = CHIP_JNI_ERROR_NO_ENV);
224224

225225
{
226-
chip::app::Clusters::Channel::Structs::ChannelLineupInfo::Type channelLineupInfo;
226+
chip::app::Clusters::Channel::Structs::LineupInfo::Type lineupInfo;
227227

228228
jobject channelLineupObject = env->CallObjectMethod(mChannelManagerObject, mGetLineupMethod);
229229
jclass channelLineupClazz = env->GetObjectClass(channelLineupObject);
@@ -233,30 +233,30 @@ CHIP_ERROR ChannelManager::getChannelLineup(chip::app::AttributeValueEncoder & a
233233
if (joperatorName != NULL)
234234
{
235235
JniUtfString operatorName(env, joperatorName);
236-
channelLineupInfo.operatorName = operatorName.charSpan();
236+
lineupInfo.operatorName = operatorName.charSpan();
237237
}
238238

239239
jfieldID lineupNameFild = env->GetFieldID(channelLineupClazz, "lineupName", "Ljava/lang/String;");
240240
jstring jlineupName = static_cast<jstring>(env->GetObjectField(channelLineupObject, lineupNameFild));
241241
if (jlineupName != NULL)
242242
{
243243
JniUtfString lineupName(env, jlineupName);
244-
channelLineupInfo.lineupName = lineupName.charSpan();
244+
lineupInfo.lineupName = lineupName.charSpan();
245245
}
246246

247247
jfieldID postalCodeFild = env->GetFieldID(channelLineupClazz, "postalCode", "Ljava/lang/String;");
248248
jstring jpostalCode = static_cast<jstring>(env->GetObjectField(channelLineupObject, postalCodeFild));
249249
if (jpostalCode != NULL)
250250
{
251251
JniUtfString postalCode(env, jpostalCode);
252-
channelLineupInfo.postalCode = postalCode.charSpan();
252+
lineupInfo.postalCode = postalCode.charSpan();
253253
}
254254

255-
jfieldID lineupInfoTypeFild = env->GetFieldID(channelLineupClazz, "lineupInfoType", "I");
256-
jint jlineupInfoType = (env->GetIntField(channelLineupObject, lineupInfoTypeFild));
257-
channelLineupInfo.lineupInfoType = static_cast<app::Clusters::Channel::ChannelLineupInfoType>(jlineupInfoType);
255+
jfieldID lineupInfoTypeFild = env->GetFieldID(channelLineupClazz, "lineupInfoTypeEnum", "I");
256+
jint jlineupInfoType = (env->GetIntField(channelLineupObject, lineupInfoTypeFild));
257+
lineupInfo.lineupInfoType = static_cast<app::Clusters::Channel::LineupInfoTypeEnum>(jlineupInfoType);
258258

259-
ReturnErrorOnFailure(aEncoder.Encode(channelLineupInfo));
259+
ReturnErrorOnFailure(aEncoder.Encode(lineupInfo));
260260

261261
return CHIP_NO_ERROR;
262262
}

‎examples/tv-app/android/java/ContentLauncherManager.cpp

+10-12
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,10 @@ using namespace chip;
4545

4646
ContentLauncherManager ContentLauncherManager::sInstance;
4747

48-
ContentLaunchResponse ContentLauncherManager::HandleLaunchContent(chip::EndpointId endpointId,
49-
const std::list<ContentLaunchParamater> & parameterList,
50-
bool autoplay, const chip::CharSpan & data)
48+
LaunchResponse ContentLauncherManager::HandleLaunchContent(chip::EndpointId endpointId, const std::list<Parameter> & parameterList,
49+
bool autoplay, const chip::CharSpan & data)
5150
{
52-
ContentLaunchResponse response;
51+
LaunchResponse response;
5352
CHIP_ERROR err = CHIP_NO_ERROR;
5453
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
5554

@@ -86,7 +85,7 @@ ContentLaunchResponse ContentLauncherManager::HandleLaunchContent(chip::Endpoint
8685
jstring jdataStr = (jstring) env->GetObjectField(resp, dataFid);
8786
JniUtfString dataStr(env, jdataStr);
8887

89-
response.status = static_cast<chip::app::Clusters::ContentLauncher::ContentLaunchStatus>(status);
88+
response.status = static_cast<chip::app::Clusters::ContentLauncher::StatusEnum>(status);
9089
response.data = dataStr.charSpan();
9190
}
9291

@@ -100,11 +99,10 @@ ContentLaunchResponse ContentLauncherManager::HandleLaunchContent(chip::Endpoint
10099
return response;
101100
}
102101

103-
ContentLaunchResponse
104-
ContentLauncherManager::HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString,
105-
const std::list<ContentLaunchBrandingInformation> & brandingInformation)
102+
LaunchResponse ContentLauncherManager::HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString,
103+
const std::list<BrandingInformation> & brandingInformation)
106104
{
107-
ContentLaunchResponse response;
105+
LaunchResponse response;
108106
CHIP_ERROR err = CHIP_NO_ERROR;
109107
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
110108

@@ -142,7 +140,7 @@ ContentLauncherManager::HandleLaunchUrl(const chip::CharSpan & contentUrl, const
142140
jstring jdataStr = (jstring) env->GetObjectField(resp, dataFid);
143141
JniUtfString dataStr(env, jdataStr);
144142

145-
response.status = static_cast<chip::app::Clusters::ContentLauncher::ContentLaunchStatus>(status);
143+
response.status = static_cast<chip::app::Clusters::ContentLauncher::StatusEnum>(status);
146144
response.data = dataStr.charSpan();
147145
}
148146

@@ -260,7 +258,7 @@ void ContentLauncherManager::InitializeWithObjects(jobject managerObject)
260258

261259
mLaunchContentMethod = env->GetMethodID(
262260
ContentLauncherClass, "launchContent",
263-
"([Lcom/tcl/chip/tvapp/ContentLaunchSearchParameter;ZLjava/lang/String;)Lcom/tcl/chip/tvapp/ContentLaunchResponse;");
261+
"([Lcom/tcl/chip/tvapp/ContentLaunchSearchParameter;ZLjava/lang/String;)Lcom/tcl/chip/tvapp/LaunchResponse;");
264262
if (mLaunchContentMethod == nullptr)
265263
{
266264
ChipLogError(Zcl, "Failed to access MediaInputManager 'launchContent' method");
@@ -269,7 +267,7 @@ void ContentLauncherManager::InitializeWithObjects(jobject managerObject)
269267

270268
mLaunchUrlMethod = env->GetMethodID(ContentLauncherClass, "launchUrl",
271269
"(Ljava/lang/String;Ljava/lang/String;Lcom/tcl/chip/tvapp/"
272-
"ContentLaunchBrandingInformation;)Lcom/tcl/chip/tvapp/ContentLaunchResponse;");
270+
"ContentLaunchBrandingInformation;)Lcom/tcl/chip/tvapp/LaunchResponse;");
273271
if (mLaunchUrlMethod == nullptr)
274272
{
275273
ChipLogError(AppServer, "Failed to access 'launchUrl' method");

‎examples/tv-app/android/java/ContentLauncherManager.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ class ContentLauncherManager : public chip::app::Clusters::ContentLauncher::Dele
3131
public:
3232
void InitializeWithObjects(jobject managerObject);
3333

34-
ContentLaunchResponse HandleLaunchContent(chip::EndpointId endpointId, const std::list<ContentLaunchParamater> & parameterList,
35-
bool autoplay, const chip::CharSpan & data) override;
36-
ContentLaunchResponse HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString,
37-
const std::list<ContentLaunchBrandingInformation> & brandingInformation) override;
34+
LaunchResponse HandleLaunchContent(chip::EndpointId endpointId, const std::list<Parameter> & parameterList, bool autoplay,
35+
const chip::CharSpan & data) override;
36+
LaunchResponse HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString,
37+
const std::list<BrandingInformation> & brandingInformation) override;
3838
std::list<std::string> HandleGetAcceptHeaderList() override;
3939
uint32_t HandleGetSupportedStreamingProtocols() override;
4040

‎examples/tv-app/android/java/KeypadInputManager.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ using namespace chip;
2828

2929
KeypadInputManager KeypadInputManager::sInstance;
3030

31-
EmberAfKeypadInputStatus keypadInputClusterSendKey(EmberAfKeypadInputCecKeyCode keyCode)
31+
chip::app::Clusters::KeypadInput::StatusEnum keypadInputClusterSendKey(chip::app::Clusters::KeypadInput::CecKeyCode keyCode)
3232
{
3333
return KeypadInputMgr().SendKey(keyCode);
3434
}
3535

36-
EmberAfKeypadInputStatus KeypadInputManager::SendKey(EmberAfKeypadInputCecKeyCode keyCode)
36+
chip::app::Clusters::KeypadInput::StatusEnum KeypadInputManager::SendKey(chip::app::Clusters::KeypadInput::CecKeyCode keyCode)
3737
{
3838
jint ret = -1;
3939
CHIP_ERROR err = CHIP_NO_ERROR;
4040
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
4141

42-
ChipLogProgress(Zcl, "Received keypadInputClusterSendKey: %d", keyCode);
42+
ChipLogProgress(Zcl, "Received keypadInputClusterSendKey: %c", to_underlying(keyCode));
4343
VerifyOrExit(mKeypadInputManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
4444
VerifyOrExit(mSendKeyMethod != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
4545
VerifyOrExit(env != NULL, err = CHIP_JNI_ERROR_NO_ENV);
@@ -51,10 +51,10 @@ EmberAfKeypadInputStatus KeypadInputManager::SendKey(EmberAfKeypadInputCecKeyCod
5151
exit:
5252
if (err != CHIP_NO_ERROR)
5353
{
54-
return EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS;
54+
return chip::app::Clusters::KeypadInput::StatusEnum::kSuccess;
5555
}
5656

57-
return static_cast<EmberAfKeypadInputStatus>(ret);
57+
return static_cast<chip::app::Clusters::KeypadInput::StatusEnum>(ret);
5858
}
5959

6060
void KeypadInputManager::InitializeWithObjects(jobject managerObject)

‎examples/tv-app/android/java/KeypadInputManager.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919
#pragma once
2020

2121
#include <app-common/zap-generated/af-structs.h>
22+
#include <app-common/zap-generated/cluster-objects.h>
2223
#include <jni.h>
2324
#include <lib/core/CHIPError.h>
2425

2526
class KeypadInputManager
2627
{
2728
public:
2829
void InitializeWithObjects(jobject managerObject);
29-
EmberAfKeypadInputStatus SendKey(EmberAfKeypadInputCecKeyCode keyCode);
30+
chip::app::Clusters::KeypadInput::StatusEnum SendKey(chip::app::Clusters::KeypadInput::CecKeyCode keyCode);
3031

3132
private:
3233
friend KeypadInputManager & KeypadInputMgr();

‎examples/tv-app/android/java/MediaInputManager.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ CHIP_ERROR MediaInputManager::GetInputList(app::AttributeValueEncoder & aEncoder
116116
jint size = env->GetArrayLength(inputArray);
117117
for (int i = 0; i < size; i++)
118118
{
119-
app::Clusters::MediaInput::Structs::MediaInputInfo::Type mediaInput;
119+
app::Clusters::MediaInput::Structs::InputInfo::Type mediaInput;
120120

121121
jobject inputObj = env->GetObjectArrayElement(inputArray, i);
122122
jclass inputClass = env->GetObjectClass(inputObj);
@@ -127,7 +127,7 @@ CHIP_ERROR MediaInputManager::GetInputList(app::AttributeValueEncoder & aEncoder
127127

128128
jfieldID typeId = env->GetFieldID(inputClass, "type", "I");
129129
jint type = env->GetIntField(inputObj, typeId);
130-
mediaInput.inputType = static_cast<app::Clusters::MediaInput::MediaInputType>(type);
130+
mediaInput.inputType = static_cast<app::Clusters::MediaInput::InputTypeEnum>(type);
131131

132132
jfieldID nameId = env->GetFieldID(inputClass, "name", "Ljava/lang/String;");
133133
jstring jname = static_cast<jstring>(env->GetObjectField(inputObj, nameId));
@@ -308,7 +308,7 @@ void MediaInputManager::InitializeWithObjects(jobject managerObject)
308308
jclass MediaInputManagerClass = env->GetObjectClass(managerObject);
309309
VerifyOrReturn(MediaInputManagerClass != nullptr, ChipLogError(Zcl, "Failed to get MediaInputManager Java class"));
310310

311-
mGetInputListMethod = env->GetMethodID(MediaInputManagerClass, "getInputList", "()[Lcom/tcl/chip/tvapp/MediaInputInfo;");
311+
mGetInputListMethod = env->GetMethodID(MediaInputManagerClass, "getInputList", "()[Lcom/tcl/chip/tvapp/InputInfo;");
312312
if (mGetInputListMethod == nullptr)
313313
{
314314
ChipLogError(Zcl, "Failed to access MediaInputManager 'getInputList' method");

0 commit comments

Comments
 (0)