Skip to content

Commit 2005232

Browse files
yunhanw-googleyunhanw-google
authoredFeb 1, 2024
Rename JniLocalReferenceManager to JniLocalReferenceScope (#31820)
·
v1.4.0.0v1.3.0.0
1 parent cfd1551 commit 2005232

23 files changed

+77
-77
lines changed
 

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ CHIP_ERROR ChannelManager::HandleGetChannelList(AttributeValueEncoder & aEncoder
6060
CHIP_ERROR err = CHIP_NO_ERROR;
6161
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
6262
VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NULL_OBJECT, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
63-
JniLocalReferenceManager manager(env);
63+
JniLocalReferenceScope scope(env);
6464

6565
ChipLogProgress(Zcl, "Received ChannelManager::HandleGetChannelList");
6666
VerifyOrExit(mChannelManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -137,7 +137,7 @@ CHIP_ERROR ChannelManager::HandleGetLineup(AttributeValueEncoder & aEncoder)
137137
CHIP_ERROR err = CHIP_NO_ERROR;
138138
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
139139
VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NULL_OBJECT, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
140-
JniLocalReferenceManager manager(env);
140+
JniLocalReferenceScope scope(env);
141141

142142
ChipLogProgress(Zcl, "Received ChannelManager::HandleGetLineup");
143143
VerifyOrExit(mChannelManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -200,7 +200,7 @@ CHIP_ERROR ChannelManager::HandleGetCurrentChannel(AttributeValueEncoder & aEnco
200200
CHIP_ERROR err = CHIP_NO_ERROR;
201201
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
202202
VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NULL_OBJECT, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
203-
JniLocalReferenceManager manager(env);
203+
JniLocalReferenceScope scope(env);
204204

205205
ChipLogProgress(Zcl, "Received ChannelManager::HandleGetCurrentChannel");
206206
VerifyOrExit(mChannelManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -275,7 +275,7 @@ void ChannelManager::HandleChangeChannel(CommandResponseHelper<ChangeChannelResp
275275
std::string name(match.data(), match.size());
276276
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
277277
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
278-
JniLocalReferenceManager manager(env);
278+
JniLocalReferenceScope scope(env);
279279

280280
ChipLogProgress(Zcl, "Received ChannelManager::HandleChangeChannel name %s", name.c_str());
281281
VerifyOrExit(mChannelManagerObject != nullptr, ChipLogError(Zcl, "mChannelManagerObject null"));
@@ -321,7 +321,7 @@ bool ChannelManager::HandleChangeChannelByNumber(const uint16_t & majorNumber, c
321321
jboolean ret = JNI_FALSE;
322322
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
323323
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
324-
JniLocalReferenceManager manager(env);
324+
JniLocalReferenceScope scope(env);
325325

326326
ChipLogProgress(Zcl, "Received ChannelManager::HandleChangeChannelByNumber majorNumber %d, minorNumber %d", majorNumber,
327327
minorNumber);
@@ -349,7 +349,7 @@ bool ChannelManager::HandleSkipChannel(const int16_t & count)
349349
jboolean ret = JNI_FALSE;
350350
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
351351
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
352-
JniLocalReferenceManager manager(env);
352+
JniLocalReferenceScope scope(env);
353353

354354
ChipLogProgress(Zcl, "Received ChannelManager::HandleSkipChannel count %d", count);
355355
VerifyOrExit(mChannelManagerObject != nullptr, ChipLogError(Zcl, "mChannelManagerObject null"));
@@ -382,7 +382,7 @@ void ChannelManager::HandleGetProgramGuide(
382382
CHIP_ERROR err = CHIP_NO_ERROR;
383383
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
384384
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
385-
JniLocalReferenceManager manager(env);
385+
JniLocalReferenceScope scope(env);
386386

387387
std::vector<ProgramType *> needToFreePrograms;
388388
std::vector<ChannelInfoType *> needToFreeChannels;
@@ -593,7 +593,7 @@ bool ChannelManager::HandleRecordProgram(const chip::CharSpan & programIdentifie
593593
jboolean ret = JNI_FALSE;
594594
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
595595
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
596-
JniLocalReferenceManager manager(env);
596+
JniLocalReferenceScope scope(env);
597597

598598
ChipLogProgress(Zcl, "Received ChannelManager::HandleRecordProgram");
599599
VerifyOrExit(mChannelManagerObject != nullptr, ChipLogError(Zcl, "mChannelManagerObject null"));
@@ -630,7 +630,7 @@ bool ChannelManager::HandleCancelRecordProgram(const chip::CharSpan & programIde
630630
jboolean ret = JNI_FALSE;
631631
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
632632
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
633-
JniLocalReferenceManager manager(env);
633+
JniLocalReferenceScope scope(env);
634634

635635
ChipLogProgress(Zcl, "Received ChannelManager::HandleCancelRecordProgram");
636636
VerifyOrExit(mChannelManagerObject != nullptr, ChipLogError(Zcl, "mChannelManagerObject null"));

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void ContentLauncherManager::HandleLaunchContent(CommandResponseHelper<LaunchRes
5555
CHIP_ERROR err = CHIP_NO_ERROR;
5656
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
5757
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
58-
JniLocalReferenceManager manager(env);
58+
JniLocalReferenceScope scope(env);
5959

6060
ChipLogProgress(Zcl, "Received ContentLauncherManager::LaunchContent");
6161
VerifyOrExit(mContentLauncherManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -110,7 +110,7 @@ void ContentLauncherManager::HandleLaunchUrl(CommandResponseHelper<LaunchRespons
110110
CHIP_ERROR err = CHIP_NO_ERROR;
111111
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
112112
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
113-
JniLocalReferenceManager manager(env);
113+
JniLocalReferenceScope scope(env);
114114

115115
ChipLogProgress(Zcl, "Received ContentLauncherManager::LaunchContentUrl");
116116
VerifyOrExit(mContentLauncherManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -164,7 +164,7 @@ CHIP_ERROR ContentLauncherManager::HandleGetAcceptHeaderList(AttributeValueEncod
164164
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
165165
std::list<std::string> acceptedHeadersList;
166166
VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NO_ENV, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
167-
JniLocalReferenceManager manager(env);
167+
JniLocalReferenceScope scope(env);
168168

169169
ChipLogProgress(Zcl, "Received ContentLauncherManager::GetAcceptHeader");
170170
VerifyOrExit(mContentLauncherManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -207,7 +207,7 @@ uint32_t ContentLauncherManager::HandleGetSupportedStreamingProtocols()
207207
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
208208
uint32_t supportedStreamingProtocols = 0;
209209
VerifyOrReturnValue(env != nullptr, 0, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
210-
JniLocalReferenceManager manager(env);
210+
JniLocalReferenceScope scope(env);
211211

212212
ChipLogProgress(Zcl, "Received ContentLauncherManager::GetSupportedStreamingProtocols");
213213
VerifyOrExit(mContentLauncherManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void KeypadInputManager::HandleSendKey(CommandResponseHelper<SendKeyResponseType
5050
CHIP_ERROR err = CHIP_NO_ERROR;
5151
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
5252
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
53-
JniLocalReferenceManager manager(env);
53+
JniLocalReferenceScope scope(env);
5454

5555
ChipLogProgress(Zcl, "Received keypadInputClusterSendKey: %c", to_underlying(keyCode));
5656
VerifyOrExit(mKeypadInputManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -76,7 +76,7 @@ void KeypadInputManager::InitializeWithObjects(jobject managerObject)
7676
{
7777
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
7878
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Failed to GetEnvForCurrentThread for KeypadInputManager"));
79-
JniLocalReferenceManager manager(env);
79+
JniLocalReferenceScope scope(env);
8080

8181
mKeypadInputManagerObject = env->NewGlobalRef(managerObject);
8282
VerifyOrReturn(mKeypadInputManagerObject != nullptr, ChipLogError(Zcl, "Failed to NewGlobalRef KeypadInputManager"));

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ CHIP_ERROR LevelManager::InitializeWithObjects(jobject managerObject)
9292
{
9393
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
9494
VerifyOrReturnLogError(env != nullptr, CHIP_ERROR_INCORRECT_STATE);
95-
JniLocalReferenceManager manager(env);
95+
JniLocalReferenceScope scope(env);
9696

9797
mLevelManagerObject = env->NewGlobalRef(managerObject);
9898
VerifyOrReturnLogError(mLevelManagerObject != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
@@ -117,7 +117,7 @@ void LevelManager::HandleLevelChanged(uint8_t value)
117117

118118
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
119119
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
120-
JniLocalReferenceManager manager(env);
120+
JniLocalReferenceScope scope(env);
121121

122122
VerifyOrReturn(mLevelManagerObject != nullptr, ChipLogProgress(Zcl, "mLevelManagerObject null"));
123123
VerifyOrReturn(mHandleLevelChangedMethod != nullptr, ChipLogProgress(Zcl, "mHandleLevelChangedMethod null"));

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void LowPowerManager::InitializeWithObjects(jobject managerObject)
4646
{
4747
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
4848
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Failed to GetEnvForCurrentThread for LowPowerManager"));
49-
JniLocalReferenceManager manager(env);
49+
JniLocalReferenceScope scope(env);
5050

5151
mLowPowerManagerObject = env->NewGlobalRef(managerObject);
5252
VerifyOrReturn(mLowPowerManagerObject != nullptr, ChipLogError(Zcl, "Failed to NewGlobalRef LowPowerManager"));
@@ -66,7 +66,7 @@ bool LowPowerManager::HandleSleep()
6666
{
6767
jboolean ret = JNI_FALSE;
6868
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
69-
JniLocalReferenceManager manager(env);
69+
JniLocalReferenceScope scope(env);
7070

7171
ChipLogProgress(Zcl, "Received LowPowerManager::Sleep");
7272
VerifyOrExit(mLowPowerManagerObject != nullptr, ChipLogError(Zcl, "mLowPowerManagerObject null"));

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ CHIP_ERROR MediaInputManager::HandleGetInputList(chip::app::AttributeValueEncode
5454
CHIP_ERROR err = CHIP_NO_ERROR;
5555
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
5656
VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NO_ENV, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
57-
JniLocalReferenceManager manager(env);
57+
JniLocalReferenceScope scope(env);
5858

5959
ChipLogProgress(Zcl, "Received MediaInputManager::HandleGetInputList");
6060
VerifyOrExit(mMediaInputManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -125,7 +125,7 @@ uint8_t MediaInputManager::HandleGetCurrentInput()
125125
jint index = -1;
126126
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
127127
VerifyOrReturnValue(env != nullptr, 0, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
128-
JniLocalReferenceManager manager(env);
128+
JniLocalReferenceScope scope(env);
129129

130130
ChipLogProgress(Zcl, "Received MediaInputManager::HandleGetCurrentInput");
131131
VerifyOrExit(mMediaInputManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -157,7 +157,7 @@ bool MediaInputManager::HandleSelectInput(const uint8_t index)
157157
jboolean ret = JNI_FALSE;
158158
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
159159
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
160-
JniLocalReferenceManager manager(env);
160+
JniLocalReferenceScope scope(env);
161161

162162
ChipLogProgress(Zcl, "Received MediaInputManager::HandleSelectInput %d", index);
163163
VerifyOrExit(mMediaInputManagerObject != nullptr, ChipLogError(Zcl, "mMediaInputManagerObject null"));
@@ -182,7 +182,7 @@ bool MediaInputManager::HandleShowInputStatus()
182182
jboolean ret = JNI_FALSE;
183183
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
184184
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
185-
JniLocalReferenceManager manager(env);
185+
JniLocalReferenceScope scope(env);
186186

187187
ChipLogProgress(Zcl, "Received MediaInputManager::HandleShowInputStatus");
188188
VerifyOrExit(mMediaInputManagerObject != nullptr, ChipLogError(Zcl, "mMediaInputManagerObject null"));
@@ -207,7 +207,7 @@ bool MediaInputManager::HandleHideInputStatus()
207207
jboolean ret = JNI_FALSE;
208208
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
209209
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
210-
JniLocalReferenceManager manager(env);
210+
JniLocalReferenceScope scope(env);
211211

212212
ChipLogProgress(Zcl, "Received MediaInputManager::HandleHideInputStatus");
213213
VerifyOrExit(mMediaInputManagerObject != nullptr, ChipLogError(Zcl, "mMediaInputManagerObject null"));
@@ -233,7 +233,7 @@ bool MediaInputManager::HandleRenameInput(const uint8_t index, const chip::CharS
233233
jboolean ret = JNI_FALSE;
234234
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
235235
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
236-
JniLocalReferenceManager manager(env);
236+
JniLocalReferenceScope scope(env);
237237

238238
ChipLogProgress(Zcl, "Received MediaInputManager::HandleRenameInput %d to %s", index, name.data());
239239
VerifyOrExit(mMediaInputManagerObject != nullptr, ChipLogError(Zcl, "mMediaInputManagerObject null"));

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ CHIP_ERROR MediaPlaybackManager::HandleGetActiveTrack(bool audio, AttributeValue
105105
CHIP_ERROR err = CHIP_NO_ERROR;
106106
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
107107
VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NULL_OBJECT, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
108-
JniLocalReferenceManager manager(env);
108+
JniLocalReferenceScope scope(env);
109109

110110
ChipLogProgress(Zcl, "MediaPlaybackManager::HandleGetActiveAudioTrack");
111111
VerifyOrExit(mMediaPlaybackManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -173,7 +173,7 @@ CHIP_ERROR MediaPlaybackManager::HandleGetAvailableTracks(bool audio, AttributeV
173173
CHIP_ERROR err = CHIP_NO_ERROR;
174174
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
175175
VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NULL_OBJECT, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
176-
JniLocalReferenceManager manager(env);
176+
JniLocalReferenceScope scope(env);
177177

178178
ChipLogProgress(Zcl, "MediaPlaybackManager::HandleGetAvailableAudioTracks");
179179
VerifyOrExit(mMediaPlaybackManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -323,7 +323,7 @@ bool MediaPlaybackManager::HandleActivateTrack(bool audio, const chip::CharSpan
323323
CHIP_ERROR err = CHIP_NO_ERROR;
324324
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
325325
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
326-
JniLocalReferenceManager manager(env);
326+
JniLocalReferenceScope scope(env);
327327

328328
ChipLogProgress(Zcl, "MediaPlaybackManager::HandleActivateAudioTrack");
329329
VerifyOrExit(mMediaPlaybackManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -354,7 +354,7 @@ bool MediaPlaybackManager::HandleDeactivateTextTrack()
354354
CHIP_ERROR err = CHIP_NO_ERROR;
355355
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
356356
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
357-
JniLocalReferenceManager manager(env);
357+
JniLocalReferenceScope scope(env);
358358

359359
ChipLogProgress(Zcl, "MediaPlaybackManager::HandleDeactivateTextTrack");
360360
VerifyOrExit(mMediaPlaybackManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -443,7 +443,7 @@ uint64_t MediaPlaybackManager::HandleMediaRequestGetAttribute(MediaPlaybackReque
443443
CHIP_ERROR err = CHIP_NO_ERROR;
444444
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
445445
VerifyOrReturnValue(env != nullptr, ret, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
446-
JniLocalReferenceManager manager(env);
446+
JniLocalReferenceScope scope(env);
447447

448448
ChipLogProgress(Zcl, "Received MediaPlaybackManager::HandleMediaRequestGetAttribute:%d", attribute);
449449
VerifyOrExit(mMediaPlaybackManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -483,7 +483,7 @@ long MediaPlaybackManager::HandleMediaRequestGetLongAttribute(MediaPlaybackReque
483483
CHIP_ERROR err = CHIP_NO_ERROR;
484484
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
485485
VerifyOrReturnValue(env != nullptr, false, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
486-
JniLocalReferenceManager manager(env);
486+
JniLocalReferenceScope scope(env);
487487

488488
ChipLogProgress(Zcl, "Received MediaPlaybackManager::HandleMediaRequestGetLongAttribute:%d", attribute);
489489
VerifyOrExit(mMediaPlaybackManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -519,7 +519,7 @@ Commands::PlaybackResponse::Type MediaPlaybackManager::HandleMediaRequest(MediaP
519519
CHIP_ERROR err = CHIP_NO_ERROR;
520520
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
521521
VerifyOrReturnValue(env != nullptr, response, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
522-
JniLocalReferenceManager manager(env);
522+
JniLocalReferenceScope scope(env);
523523

524524
ChipLogProgress(Zcl, "MediaPlaybackManager::Request %d-%ld", mediaPlaybackRequest,
525525
static_cast<long>(deltaPositionMilliseconds));
@@ -558,7 +558,7 @@ CHIP_ERROR MediaPlaybackManager::HandleGetSampledPosition(AttributeValueEncoder
558558
CHIP_ERROR err = CHIP_NO_ERROR;
559559
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
560560
VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NULL_OBJECT, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
561-
JniLocalReferenceManager manager(env);
561+
JniLocalReferenceScope scope(env);
562562

563563
ChipLogProgress(Zcl, "MediaPlaybackManager::HandleGetSampledPosition");
564564
VerifyOrExit(mMediaPlaybackManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ CHIP_ERROR OnOffManager::InitializeWithObjects(jobject managerObject)
9292
{
9393
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
9494
VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NO_ENV, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
95-
JniLocalReferenceManager manager(env);
95+
JniLocalReferenceScope scope(env);
9696

9797
mOnOffManagerObject = env->NewGlobalRef(managerObject);
9898
VerifyOrReturnLogError(mOnOffManagerObject != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
@@ -117,7 +117,7 @@ void OnOffManager::HandleOnOffChanged(bool value)
117117

118118
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
119119
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNIEnv for current thread"));
120-
JniLocalReferenceManager manager(env);
120+
JniLocalReferenceScope scope(env);
121121

122122
VerifyOrReturn(mOnOffManagerObject != nullptr, ChipLogProgress(Zcl, "mOnOffManagerObject null"));
123123
VerifyOrReturn(mHandleOnOffChangedMethod != nullptr, ChipLogProgress(Zcl, "mHandleOnOffChangedMethod null"));

0 commit comments

Comments
 (0)
Please sign in to comment.