| OLD | NEW | 
|   1 /* |   1 /* | 
|   2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |   2  *  Copyright (c) 2013 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  | 
|  11 #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_HELPERS_ANDROID_H_ |  11 #ifndef WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ | 
|  12 #define WEBRTC_MODULES_UTILITY_INTERFACE_HELPERS_ANDROID_H_ |  12 #define WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ | 
 |  13  | 
 |  14 #pragma message("WARNING: utility/interface is DEPRECATED; use utility/include") | 
|  13  |  15  | 
|  14 #include <jni.h> |  16 #include <jni.h> | 
|  15 #include <string> |  17 #include <string> | 
|  16  |  18  | 
|  17 // Abort the process if |jni| has a Java exception pending. |  19 // Abort the process if |jni| has a Java exception pending. | 
|  18 // TODO(henrika): merge with CHECK_JNI_EXCEPTION() in jni_helpers.h. |  20 // TODO(henrika): merge with CHECK_JNI_EXCEPTION() in jni_helpers.h. | 
|  19 #define CHECK_EXCEPTION(jni)        \ |  21 #define CHECK_EXCEPTION(jni)        \ | 
|  20   RTC_CHECK(!jni->ExceptionCheck()) \ |  22   RTC_CHECK(!jni->ExceptionCheck()) \ | 
|  21       << (jni->ExceptionDescribe(), jni->ExceptionClear(), "") |  23       << (jni->ExceptionDescribe(), jni->ExceptionClear(), "") | 
|  22  |  24  | 
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  77   T operator*() const { |  79   T operator*() const { | 
|  78     return obj_; |  80     return obj_; | 
|  79   } |  81   } | 
|  80  private: |  82  private: | 
|  81   JNIEnv* jni_; |  83   JNIEnv* jni_; | 
|  82   T obj_; |  84   T obj_; | 
|  83 }; |  85 }; | 
|  84  |  86  | 
|  85 }  // namespace webrtc |  87 }  // namespace webrtc | 
|  86  |  88  | 
|  87 #endif  // WEBRTC_MODULES_UTILITY_INTERFACE_HELPERS_ANDROID_H_ |  89 #endif  // WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ | 
| OLD | NEW |