equal
deleted
inserted
replaced
59 TRAPD(err,ConnectionManager::PromptUserL(apnInfo)); |
59 TRAPD(err,ConnectionManager::PromptUserL(apnInfo)); |
60 if (err == KErrNone) |
60 if (err == KErrNone) |
61 { |
61 { |
62 LOG1(ESOCKET,EInfo,"+apnInfo = %s",apnInfo); |
62 LOG1(ESOCKET,EInfo,"+apnInfo = %s",apnInfo); |
63 jstring jnistring = aJni->NewStringUTF(apnInfo); |
63 jstring jnistring = aJni->NewStringUTF(apnInfo); |
|
64 delete[] apnInfo; |
64 return jnistring; |
65 return jnistring; |
65 } |
66 } |
66 else |
67 else |
67 { |
68 { |
|
69 delete[] apnInfo; |
68 return NULL; |
70 return NULL; |
69 } |
71 } |
70 |
|
71 } |
72 } |
72 |
73 |
73 JNIEXPORT jstring JNICALL |
74 JNIEXPORT jstring JNICALL |
74 Java_com_nokia_mj_impl_connectionmanager_ConnectionManager__1getDeviceDefaultAccessPoint |
75 Java_com_nokia_mj_impl_connectionmanager_ConnectionManager__1getDeviceDefaultAccessPoint |
75 (JNIEnv *aJni, jobject /*peer*/) |
76 (JNIEnv *aJni, jobject /*peer*/) |
79 TRAPD(err,ConnectionManager::GetDeviceDefaultAccessPointL(apnInfo)); |
80 TRAPD(err,ConnectionManager::GetDeviceDefaultAccessPointL(apnInfo)); |
80 if (err == KErrNone) |
81 if (err == KErrNone) |
81 { |
82 { |
82 LOG1(ESOCKET,EInfo,"+apnInfo = %s",apnInfo); |
83 LOG1(ESOCKET,EInfo,"+apnInfo = %s",apnInfo); |
83 jstring jnistring = aJni->NewStringUTF(apnInfo); |
84 jstring jnistring = aJni->NewStringUTF(apnInfo); |
|
85 delete[] apnInfo; |
84 return jnistring; |
86 return jnistring; |
85 } |
87 } |
86 else |
88 else |
87 { |
89 { |
|
90 delete[] apnInfo; |
88 return NULL; |
91 return NULL; |
89 } |
92 } |
90 } |
93 } |