# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1266850610 21600
# Node ID ccd4bc5cc0787d4f3fe8a6864a74abbe4fdb711c
# Parent  3360f7e9df9feb13acff8e33baf49c931628abba# Parent  df5d2c2b63ab9706ba3493cda07c45dd97a47ec5
Merge commit

diff -r df5d2c2b63ab -r ccd4bc5cc078 connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/META-INF/MANIFEST.MF
--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/META-INF/MANIFEST.MF	Fri Feb 19 17:10:07 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/META-INF/MANIFEST.MF	Mon Feb 22 08:56:50 2010 -0600
@@ -9,7 +9,8 @@
  org.eclipse.core.runtime,
  org.eclipse.jface,
  org.eclipse.ui,
- com.nokia.carbide.remoteConnections
+ com.nokia.carbide.remoteConnections,
+ com.nokia.cpp.utils.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
diff -r df5d2c2b63ab -r ccd4bc5cc078 connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/agent/PCCSDiscoveryAgent.java
--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/agent/PCCSDiscoveryAgent.java	Fri Feb 19 17:10:07 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/agent/PCCSDiscoveryAgent.java	Mon Feb 22 08:56:50 2010 -0600
@@ -37,6 +37,7 @@
 import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager;
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2;
 import com.nokia.carbide.remoteconnections.internal.api.IDeviceDiscoveryAgent;
+import com.nokia.cpp.internal.api.utils.core.HostOS;
 
 /**
  * Implementation of IDeviceDiscoveryAgent for PCCS USB connection.
@@ -296,16 +297,18 @@
 	}
 
 	public IPrerequisiteStatus getPrerequisiteStatus() {
-		// Manager calls this first so we can check if we can load.
-		// so let's open the discovery and close it catching any exceptions.
-		try {
-			pccsConnection.open();
-			// successful load - close it as start() will open again
-			pccsConnection.close();
-		} catch (CoreException ce) {
-			saveLoadStatus(ce);
-		}
-		
+		// Only try on platforms that run PC Suite
+		if (HostOS.IS_WIN32) {
+			// Manager calls this first so we can check if we can load.
+			// so let's open the discovery and close it catching any exceptions.
+			try {
+				pccsConnection.open();
+				// successful load - close it as start() will open again
+				pccsConnection.close();
+			} catch (CoreException ce) {
+				saveLoadStatus(ce);
+			}
+		}		
 		return loadStatus;
 	}
 }