Merge "Moving carrier specific code from DMConfigureDB to carrier's DM plugin." into lmp-dev

2 files changed, 36 insertions, 0 deletions

diff --git a/engine/javaplugin/api/com/android/omadm/plugin/DmtBasePlugin.java b/engine/javaplugin/api/com/android/omadm/plugin/DmtBasePlugin.java
index 9621730..982b525 100644
--- a/engine/javaplugin/api/com/android/omadm/plugin/DmtBasePlugin.java
+++ b/engine/javaplugin/api/com/android/omadm/plugin/DmtBasePlugin.java
@@ -104,4 +104,19 @@ public abstract class DmtBasePlugin extends IDmtPlugin.Stub {
     public int commit() throws RemoteException {
         return setOperationResult(ErrorCodes.SYNCML_DM_UNSUPPORTED_OPERATION);
     }
+
+    @Override
+    public String getServerPW() {
+        return null;
+    }
+
+    @Override
+    public String getClientPW() {
+        return null;
+    }
+
+    @Override
+    public String getUsername() {
+        return null;
+    }
 }
diff --git a/engine/javaplugin/api/com/android/omadm/plugin/IDmtPlugin.aidl b/engine/javaplugin/api/com/android/omadm/plugin/IDmtPlugin.aidl
index 8a1c8d2..7a9630a 100644
--- a/engine/javaplugin/api/com/android/omadm/plugin/IDmtPlugin.aidl
+++ b/engine/javaplugin/api/com/android/omadm/plugin/IDmtPlugin.aidl
@@ -177,4 +177,25 @@ interface IDmtPlugin
      * @return ErrorCodes.SYNCML_DM_SUCCESS in success case, otherwise an error.
      */
     int commit();
+
+    /**
+     * Returns DM account server PW. This is not lookup from the DM tree; this function generates it.
+     *
+     * @return String. null if plugin is not carrier specific
+     */
+    String getServerPW();
+
+    /**
+     * Returns DM account client PW. This is not lookup from the DM tree; this function generates it.
+     *
+     * @return String. null if plugin is not carrier specific
+     */
+    String getClientPW();
+
+    /**
+     * Returns DM account user name. This is not lookup from the DM tree; this function generates it.
+     *
+     * @return String. null if plugin is not carrier specific
+     */
+    String getUsername();
 }