Feature/4.10 updates

MobileWeather/app/build.gradle

@@ -16,6 +16,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    flavorDimensions "default"
+    productFlavors{
+        multi_sec_off {
+            buildConfigField 'String', 'TRANSPORT', '"MULTI"'
+            buildConfigField 'String', 'SECURITY', '"OFF"'
+        }
+        tcp {
+            buildConfigField 'String', 'TRANSPORT', '"TCP"'
+            buildConfigField 'String', 'SECURITY', '"OFF"'
+        }
+    }
+    lintOptions {
+        disable 'GoogleAppIndexingWarning'
+    }
 }
 
 dependencies {

MobileWeather/app/src/main/AndroidManifest.xml

@@ -45,9 +45,8 @@
 
         <activity android:name="net.hockeyapp.android.UpdateActivity" />
 
-        <activity
-            android:name="com.smartdevicelink.managers.lockscreen.SDLLockScreenActivity"
-            android:launchMode="singleTop" />
+        <activity android:name="com.smartdevicelink.managers.lockscreen.SDLLockScreenActivity"
+            android:launchMode="singleTop"/>
 
         <service android:name="com.sdl.mobileweather.smartdevicelink.SdlService"/>
         <service android:name="com.sdl.mobileweather.wunderground.WUndergroundService"/>

MobileWeather/app/src/main/java/com/sdl/mobileweather/smartdevicelink/SdlApplication.java

@@ -1,11 +1,8 @@
 package com.sdl.mobileweather.smartdevicelink;
 
-import java.util.Locale;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Application;
-import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -14,16 +11,16 @@
 
 import com.sdl.mobileweather.R;
 import com.sdl.mobileweather.forecastio.ForecastIoService;
+import com.sdl.mobileweather.localization.LocalizationUtil;
 import com.sdl.mobileweather.location.PlayServicesConnectionChecker;
 import com.sdl.mobileweather.location.WeatherLocationServices;
 import com.sdl.mobileweather.weather.WeatherAlarmManager;
 import com.sdl.mobileweather.weather.WeatherDataManager;
 import com.sdl.mobileweather.weather.WeatherUpdateWakefulReceiver;
-import com.smartdevicelink.BuildConfig;
-import com.smartdevicelink.exception.SdlException;
+import com.sdl.mobileweather.BuildConfig;
 import com.smartdevicelink.managers.SdlManager;
-import com.smartdevicelink.proxy.SdlProxyALM;
-import com.sdl.mobileweather.localization.LocalizationUtil;
+
+import java.util.Locale;
 
 
 public class SdlApplication extends Application {
@@ -92,19 +89,16 @@ public void onConfigurationChanged(Configuration newConfig) {
 	public void onLowMemory() {
 		super.onLowMemory();
 	}
-
-    public void startSdlProxyService() {
-    	Log.i(SdlApplication.TAG, "Starting SmartDeviceLink service");
-        // Get the local Bluetooth adapter
-        BluetoothAdapter mBtAdapter = BluetoothAdapter.getDefaultAdapter();
 
-        // If BT adapter exists, is enabled, and there are paired devices, start service/proxy
-        if (mBtAdapter != null)
-		{
-			if ((mBtAdapter.isEnabled() && mBtAdapter.getBondedDevices().isEmpty() == false)) 
-			{
-				SdlReceiver.queryForConnectedService(this);
-			}
+	public void startSdlProxyService() {
+		Log.i(SdlApplication.TAG, "Starting SmartDeviceLink service");
+		if (BuildConfig.TRANSPORT.equals("MULTI")) {
+			Log.i(TAG, "startSdlProxyService: Multiplex Selected");
+			SdlReceiver.queryForConnectedService(this);
+		} else if (BuildConfig.TRANSPORT.equals("TCP")) {
+			Log.i(TAG, "startSdlProxyService: TCP Selected");
+			Intent proxyIntent = new Intent(this, SdlService.class);
+			startService(proxyIntent);
 		}
 	}
 
@@ -122,15 +116,6 @@ public void endSdlProxyInstance() {
 			}
 		}
 	}
-
-	// Stop the SdlService
-	public void endSdlProxyService() {
-		Log.i(SdlApplication.TAG, "Ending SmartDeviceLink service");
-		SdlService serviceInstance = SdlService.getInstance();
-		if (serviceInstance != null){
-			serviceInstance.stopService();
-		}
-	}
 
     public void startWeatherUpdates() {
     	Log.i(SdlApplication.TAG, "Starting weather updates");