equal
deleted
inserted
replaced
23 #include <hal.h> |
23 #include <hal.h> |
24 #include <hal_data.h> |
24 #include <hal_data.h> |
25 #include <sysutil.h> |
25 #include <sysutil.h> |
26 #include <driveinfo.h> |
26 #include <driveinfo.h> |
27 |
27 |
|
28 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
29 #include "hbextendedlocale.h" |
|
30 #endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
31 |
28 #include "com_nokia_mj_impl_installer_utils_SysUtil.h" |
32 #include "com_nokia_mj_impl_installer_utils_SysUtil.h" |
|
33 #include "javajniutils.h" |
29 #include "logger.h" |
34 #include "logger.h" |
30 |
35 |
31 #ifndef KPSUidJavaLatestInstallation |
36 #ifndef KPSUidJavaLatestInstallation |
32 #define KPSUidJavaLatestInstallation 0x10282567 |
37 #define KPSUidJavaLatestInstallation 0x10282567 |
33 #endif |
38 #endif |
|
39 |
|
40 using namespace java::util; |
34 |
41 |
35 /** |
42 /** |
36 * Helper method for creating HBufC from jstring. |
43 * Helper method for creating HBufC from jstring. |
37 */ |
44 */ |
38 HBufC* CreateHBufCFromJavaStringLC(JNIEnv* aEnv, jstring aString) |
45 HBufC* CreateHBufCFromJavaStringLC(JNIEnv* aEnv, jstring aString) |
718 { |
725 { |
719 return err; |
726 return err; |
720 } |
727 } |
721 return value; |
728 return value; |
722 } |
729 } |
|
730 |
|
731 /* |
|
732 * Class: com_nokia_mj_impl_installer_utils_SysUtil |
|
733 * Method: _isoToLang |
|
734 * Signature: ()[Ljava/lang/String; |
|
735 */ |
|
736 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_utils_SysUtil__1isoToLang |
|
737 (JNIEnv *aEnv, jclass, jstring aLocale) |
|
738 { |
|
739 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
740 return HbExtendedLocale::ISOToSymbianLang( |
|
741 QString::fromStdWString(JniUtils::jstringToWstring(aEnv, aLocale))); |
|
742 #else // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
743 (void)aEnv; // suppress compilation warning about unused argument |
|
744 (void)aLocale; // suppress compilation warning about unused argument |
|
745 return -1; |
|
746 #endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
747 } |