OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 } | 163 } |
164 | 164 |
165 jmethodID JavaClass::GetStaticMethodId( | 165 jmethodID JavaClass::GetStaticMethodId( |
166 const char* name, const char* signature) { | 166 const char* name, const char* signature) { |
167 return GetStaticMethodID(jni_, j_class_, name, signature); | 167 return GetStaticMethodID(jni_, j_class_, name, signature); |
168 } | 168 } |
169 | 169 |
170 jobject JavaClass::CallStaticObjectMethod(jmethodID methodID, ...) { | 170 jobject JavaClass::CallStaticObjectMethod(jmethodID methodID, ...) { |
171 va_list args; | 171 va_list args; |
172 va_start(args, methodID); | 172 va_start(args, methodID); |
173 jobject res = jni_->CallStaticObjectMethod(j_class_, methodID, args); | 173 jobject res = jni_->CallStaticObjectMethodV(j_class_, methodID, args); |
174 CHECK_EXCEPTION(jni_) << "Error during CallStaticObjectMethod"; | 174 CHECK_EXCEPTION(jni_) << "Error during CallStaticObjectMethod"; |
175 return res; | 175 return res; |
176 } | 176 } |
177 | 177 |
178 jint JavaClass::CallStaticIntMethod(jmethodID methodID, ...) { | 178 jint JavaClass::CallStaticIntMethod(jmethodID methodID, ...) { |
179 va_list args; | 179 va_list args; |
180 va_start(args, methodID); | 180 va_start(args, methodID); |
181 jint res = jni_->CallStaticIntMethod(j_class_, methodID, args); | 181 jint res = jni_->CallStaticIntMethodV(j_class_, methodID, args); |
182 CHECK_EXCEPTION(jni_) << "Error during CallStaticIntMethod"; | 182 CHECK_EXCEPTION(jni_) << "Error during CallStaticIntMethod"; |
183 return res; | 183 return res; |
184 } | 184 } |
185 | 185 |
186 // JNIEnvironment implementation. | 186 // JNIEnvironment implementation. |
187 JNIEnvironment::JNIEnvironment(JNIEnv* jni) : jni_(jni) { | 187 JNIEnvironment::JNIEnvironment(JNIEnv* jni) : jni_(jni) { |
188 ALOGD("JNIEnvironment::ctor%s", GetThreadInfo().c_str()); | 188 ALOGD("JNIEnvironment::ctor%s", GetThreadInfo().c_str()); |
189 } | 189 } |
190 | 190 |
191 JNIEnvironment::~JNIEnvironment() { | 191 JNIEnvironment::~JNIEnvironment() { |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni)); | 275 return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni)); |
276 } | 276 } |
277 | 277 |
278 JavaClass JVM::GetClass(const char* name) { | 278 JavaClass JVM::GetClass(const char* name) { |
279 ALOGD("JVM::GetClass(%s)%s", name, GetThreadInfo().c_str()); | 279 ALOGD("JVM::GetClass(%s)%s", name, GetThreadInfo().c_str()); |
280 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 280 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
281 return JavaClass(jni(), LookUpClass(name)); | 281 return JavaClass(jni(), LookUpClass(name)); |
282 } | 282 } |
283 | 283 |
284 } // namespace webrtc | 284 } // namespace webrtc |
OLD | NEW |