MCL/sf/app/jrt: comparison javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/Installer.java

equal deleted inserted replaced

-:e5618cc85d74
+:6c158198356e
 * Return value which indicates that installer must not exit with
 * System.exit(). This return value is only used for internally.
 */
 static final int RET_NO_SYSTEM_EXIT = 100;
+/** Id for installer cancel Comms message. */
+private static final int INSTALLER_CANCEL_MESSAGE_ID = 603;
+/** Id for installer cancel Comms response message. */
+private static final int INSTALLER_CANCEL_RESPONSE_MESSAGE_ID = 604;
 // ThreadDumper instance.
 private static ThreadDumper iThreadDumper = null;
 // Installer CommsServer.
 private static CommsServerEndpoint iInstallerServer = null;
 {
 Log.log("JAVA_BIN_ROOT=" + javaBinRoot);
 }
 StartUpTrace.doTrace("Installer.mainWithResult " + aArgs[0] + " begins");
-StringBuffer buf = new StringBuffer("Java install process started with command: ");
+StringBuffer buf = new StringBuffer("Java install process started with command:");
 for (int i = 0; i < aArgs.length; i++)
 {
 buf.append(" ").append(aArgs[i]);
 }
 Log.logInfoPrd(buf.toString());
 int exitCode = ERR_NONE;
 Args args = new Args(aArgs);
 if (iThreadDumper != null)
 {
-iThreadDumper.startTimer(10*60*1000); // 10 mins
+iThreadDumper.startTimer(5*60*1000); // 5 mins
 }
 try
 {
 // Do IntegrityService rollback every time installer is started.
 table.add(new com.nokia.mj.impl.installer.midp2.install.steps.
 GetAttributes());
 table.add(new com.nokia.mj.impl.installer.midp2.install.steps.
 GetFromStorage());
 table.add(new com.nokia.mj.impl.installer.midp2.install.steps.
+SelectUids()); // Select suite uid and application uids.
+table.add(new com.nokia.mj.impl.installer.midp2.install.steps.
 StartProgressNotifications());
-table.add(new com.nokia.mj.impl.installer.midp2.install.steps.
-SelectUids()); // Select suite uid and application uids.
 table.add(new com.nokia.mj.impl.installer.midp2.install.steps.
 AuthenticateJad()); // This must be the first security
 // related step.
 table.add(new com.nokia.mj.impl.installer.midp2.install.steps.
 GrantJadPermissions()); // Permission granting must be
 "  -skipjarcheck                 Skip application package scanning.\n"+
 "  -skipotastatus                Skip OTA status handling.\n"+
 "  -commsresult=endpoint         In the end of operation, send\n"+
 "                                InstallerResultMessage to specified comms\n"+
 "                                endpoint.\n"+
+"  -base64=base64options         Comma separated list of base64 encoded\n"+
+"                                options.\n"+
 "\n"+
 "Either -jad or -jar must be specified, other options are optional.\n";
 String uninstallCmd =
 "Uninstalls Java application suite.\n"+
 "                                anything. This option is for debugging\n"+
 "                                purposes only.\n"+
 "  -captainmsgs=yes|no           If set to no, JavaInstaller will not send\n"+
 "                                any messages to JavaCaptain during\n"+
 "                                uninstallation. Default is yes.\n"+
+"  -resetpreinstall              Reset preinstall state.\n"+
 "  -skipotastatus                Skip OTA status handling.\n"+
 "  -commsresult=endpoint         In the end of operation, send\n"+
 "                                InstallerResultMessage to specified comms\n"+
 "                                endpoint.\n"+
+"  -base64=base64options         Comma separated list of base64 encoded\n"+
+"                                options.\n"+
 "\n"+
 "The -uid option must be specified, other options are optional.\n";
 String uninstallAllCmd =
 "Uninstalls all installed Java application suites.\n"+
 int result = ERR_GENERAL;
 Log.log("InstallerListener received " + aMessage);
 if (aMessage.hasPermission(CommsPermission.INSTALL_APPLICATION))
 {
 int msgId = aMessage.getMessageId();
-if (msgId == 603)
+if (msgId == INSTALLER_CANCEL_MESSAGE_ID)
 {
 Installer.cancel();
 result = ERR_NONE;
 }
 }
 Log.logWarning("InstallerListener received message " +
 "with no INSTALL_APPLICATION permission");
 }
 CommsMessage response = new CommsMessage();
 response.replyTo(aMessage);
-response.setMessageId(604);
+response.setMessageId(INSTALLER_CANCEL_RESPONSE_MESSAGE_ID);
 response.write(result);
 iInstallerServer.send(response);
 Log.log("InstallerListener sent " + response);
 }
 catch (Throwable t)

branch	RCL_3
changeset 24	6c158198356e
parent 17	0fd27995241b
child 25	ae942d28ec0e