Correct function name in OMA-DM engine to match java function name.

This is to fix following error caused due to incorrect function name.
09-26 14:51:43.391  3769  3791 E AndroidRuntime: java.lang.NoSuchMethodError: 
no non-static method "Lcom/android/omadm/service/DMSession;
.getDmAlert()Lcom/android/omadm/service/DmAlert;"

Bug: 17754958
Change-Id: Ia6b8e5947239144dd148c86771babd6cfe2bafe9

3 files changed, 13 insertions, 13 deletions

diff --git a/engine/jni/DMServiceAlert.cc b/engine/jni/DMServiceAlert.cc
index 105a80f..9b606b2 100644
--- a/engine/jni/DMServiceAlert.cc
+++ b/engine/jni/DMServiceAlert.cc
@@ -33,7 +33,7 @@ DMServiceAlert::DMServiceAlert() : m_jDmEnv(NULL), m_jDmAlertCls(NULL), m_jDmAle
    }
    LOGD("DMServiceAlert: Get JNI Env success.");
 
-   m_jDmAlertObj = getDmAlert(m_jDmEnv);
+   m_jDmAlertObj = getDMAlert(m_jDmEnv);
    if ( NULL == m_jDmAlertObj) {
       LOGE("DMServiceAlert: m_jDmEnv->CallObjectMethod failed!");
       return;
diff --git a/engine/jni/DMServiceMain.cc b/engine/jni/DMServiceMain.cc
index 171c7e8..e06010b 100644
--- a/engine/jni/DMServiceMain.cc
+++ b/engine/jni/DMServiceMain.cc
@@ -214,16 +214,16 @@ JNIEXPORT jint JNICALL startFotaClientSession(JNIEnv* jenv, jclass,
     g_sessionObj = jdmobj;
 
     const char* szDmServerId = jenv->GetStringUTFChars(jServerId, NULL);
-    const char* szDmAlertStr = NULL;
+    const char* szDMAlertStr = NULL;
     if (jAlertStr != NULL) {
-        szDmAlertStr = jenv->GetStringUTFChars(jAlertStr, NULL);
+        szDMAlertStr = jenv->GetStringUTFChars(jAlertStr, NULL);
     }
 
     DmtPrincipal principal(szDmServerId);
 
     DMString alertURI("./DevDetail/Ext/SystemUpdate");
     DMString strEmpty;
-    DmtFirmAlert alert(alertURI, strEmpty, szDmAlertStr, "chr", strEmpty, strEmpty);
+    DmtFirmAlert alert(alertURI, strEmpty, szDMAlertStr, "chr", strEmpty, strEmpty);
     DmtSessionProp prop(alert, true);
 
     g_cancelSession = 0;
@@ -231,7 +231,7 @@ JNIEXPORT jint JNICALL startFotaClientSession(JNIEnv* jenv, jclass,
     ret_status = DmtTreeFactory::StartServerSession(principal, prop);
 
     if (jAlertStr != NULL) {
-        jenv->ReleaseStringUTFChars(jAlertStr, szDmAlertStr);
+        jenv->ReleaseStringUTFChars(jAlertStr, szDMAlertStr);
     }
 
     g_sessionObj = NULL;
@@ -347,9 +347,9 @@ jobject getNetConnector()
     return env->CallObjectMethod(g_sessionObj, jgetNet);
 }
 
-jobject getDmAlert(JNIEnv* env)
+jobject getDMAlert(JNIEnv* env)
 {
-   LOGD(("DM Alert: enter getDmAlert()"));
+   LOGD(("DM Alert: enter getDMAlert()"));
    if (NULL == g_sessionObj) {
        LOGE(("DM Alert: g_sessionObj is NULL!"));
        return NULL;
@@ -362,16 +362,16 @@ jobject getDmAlert(JNIEnv* env)
    }
    LOGD(("DM Alert: success env->GetObjectClass(...)"));
 
-   jmethodID jdmGetDmAlert = env->GetMethodID(jdmSessionClz,
-            "getDmAlert",
-            "()Lcom/android/omadm/service/DmAlert;");
-   if ( NULL == jdmGetDmAlert ) {
+   jmethodID jdmGetDMAlert = env->GetMethodID(jdmSessionClz,
+            "getDMAlert",
+            "()Lcom/android/omadm/service/DMAlert;");
+   if ( NULL == jdmGetDMAlert ) {
        LOGE(("DM Alert: env->GetMethodID(jdmSessionClz) failed!"));
        return NULL;
    }
    LOGD(("DM Alert: success env->GetMethodID(...)"));
 
-   return env->CallObjectMethod(g_sessionObj, jdmGetDmAlert);
+   return env->CallObjectMethod(g_sessionObj, jdmGetDMAlert);
 }
 
 JNIEXPORT jint JNICALL cancelSession(JNIEnv*, jclass)
diff --git a/engine/jni/DMServiceMain.h b/engine/jni/DMServiceMain.h
index 11d669d..045dd5a 100644
--- a/engine/jni/DMServiceMain.h
+++ b/engine/jni/DMServiceMain.h
@@ -49,7 +49,7 @@ extern "C" {
 static const char* const javaDMEnginePackage = "com/android/omadm/service/NativeDM";
 
 jobject getNetConnector();
-jobject getDmAlert(JNIEnv *env);
+jobject getDMAlert(JNIEnv *env);
 
 #ifdef __cplusplus
 }