fix: do not remove ports forwarding for Android on cleanup

Comment the code that removes the port forwarding for Android as this is a breaking change in the behavior. Uncomment the code for 6.0.0 release.

Author: rosen-vladimirov

lib/common/mobile/mobile-core/android-process-service.ts

@@ -9,9 +9,7 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 
 	constructor(private $errors: IErrors,
 		private $injector: IInjector,
-		private $net: INet,
-		private $cleanupService: ICleanupService,
-		private $staticConfig: IStaticConfig) {
+		private $net: INet) {
 		this._devicesAdbs = {};
 		this._forwardedLocalPorts = {};
 	}
@@ -122,7 +120,8 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 		}
 
 		this._forwardedLocalPorts[portForwardInputData.deviceIdentifier] = localPort;
-		await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", portForwardInputData.deviceIdentifier, "forward", "--remove", `tcp:${localPort}`] });
+		// TODO: Uncomment for 6.0.0 release
+		// await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", portForwardInputData.deviceIdentifier, "forward", "--remove", `tcp:${localPort}`] });
 		return localPort && +localPort;
 	}
 

lib/services/android-device-debug-service.ts

@@ -17,9 +17,7 @@ export class AndroidDeviceDebugService extends DebugServiceBase implements IDevi
 		private $logger: ILogger,
 		private $androidProcessService: Mobile.IAndroidProcessService,
 		private $net: INet,
-		private $cleanupService: ICleanupService,
-		private $deviceLogProvider: Mobile.IDeviceLogProvider,
-		private $staticConfig: IStaticConfig) {
+		private $deviceLogProvider: Mobile.IDeviceLogProvider) {
 
 		super(device, $devicesService);
 		this.deviceIdentifier = device.deviceInfo.identifier;
@@ -71,7 +69,8 @@ export class AndroidDeviceDebugService extends DebugServiceBase implements IDevi
 			await this.unixSocketForward(port, `${unixSocketName}`);
 		}
 
-		await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", deviceId, "forward", "--remove", `tcp:${port}`] });
+		// TODO: Uncomment for 6.0.0 release
+		// await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", deviceId, "forward", "--remove", `tcp:${port}`] });
 
 		return port;
 	}

test/services/android-device-debug-service.ts

@@ -11,10 +11,8 @@ class AndroidDeviceDebugServiceInheritor extends AndroidDeviceDebugService {
 		$logger: ILogger,
 		$androidProcessService: Mobile.IAndroidProcessService,
 		$net: INet,
-		$deviceLogProvider: Mobile.IDeviceLogProvider,
-		$cleanupService: ICleanupService,
-		$staticConfig: IStaticConfig) {
-		super(<any>{ deviceInfo: { identifier: "123" } }, $devicesService, $errors, $logger, $androidProcessService, $net, $cleanupService, $deviceLogProvider, $staticConfig);
+		$deviceLogProvider: Mobile.IDeviceLogProvider) {
+		super(<any>{ deviceInfo: { identifier: "123" } }, $devicesService, $errors, $logger, $androidProcessService, $net, $deviceLogProvider);
 	}
 
 	public getChromeDebugUrl(debugOptions: IDebugOptions, port: number): string {