4.8 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 {
@@ -25,5 +39,5 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.smartdevicelink:sdl_android:4.+'
     implementation 'net.hockeyapp.android:HockeySDK:5.1.0'
-    implementation 'com.google.android.gms:play-services-location:15.0.1'
+    implementation 'com.google.android.gms:play-services-location:16.0.0'
 }

MobileWeather/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.sdl.mobileweather">
 
 
@@ -11,68 +12,66 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <!-- Required for current location -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <!-- Required for ??? -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <!-- Required to keep device awake during weather data processing -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
     <application
-        android:name="com.sdl.mobileweather.smartdevicelink.SmartDeviceLinkApplication"
+        android:name="com.sdl.mobileweather.smartdevicelink.SdlApplication"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:allowBackup="true" >
+        tools:ignore="GoogleAppIndexingWarning">
 
         <activity
             android:name="com.sdl.mobileweather.activity.MainActivity"
-            android:label="@string/title_activity_main"
             android:configChanges="orientation"
-            android:screenOrientation="portrait" >
+            android:label="@string/title_activity_main"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="com.sdl.mobileweather.activity.LockScreenActivity"
-            android:label="Locked"
-            android:configChanges="orientation"
-            android:screenOrientation="portrait" >
-        </activity>
         <activity android:name="net.hockeyapp.android.UpdateActivity" />
 
-        <service android:name="com.sdl.mobileweather.smartdevicelink.SmartDeviceLinkService" >
-        </service>
-        <service android:name="com.sdl.mobileweather.wunderground.WUndergroundService" >
-        </service>
-        <service android:name="com.sdl.mobileweather.forecastio.ForecastIoService" >
-        </service>
+        <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"/>
+        <service android:name="com.sdl.mobileweather.forecastio.ForecastIoService"/>
 
         <service
             android:name="com.sdl.mobileweather.smartdevicelink.SdlRouterService"
             android:exported="true"
             android:process="com.smartdevicelink.router">
             <intent-filter>
-                <action android:name="com.smartdevicelink.router.service"/>
+                <action android:name="com.smartdevicelink.router.service" />
             </intent-filter>
-            <meta-data android:name="@string/sdl_router_service_version_name"  android:value="@integer/sdl_router_service_version_value" />
+            <meta-data
+                android:name="@string/sdl_router_service_version_name"
+                android:value="@integer/sdl_router_service_version_value" />
         </service>
 
-        <receiver android:name="com.sdl.mobileweather.smartdevicelink.SmartDeviceLinkReceiver" >
+        <receiver android:name="com.sdl.mobileweather.smartdevicelink.SdlReceiver">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
                 <action android:name="sdl.router.startservice" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name="com.sdl.mobileweather.weather.WeatherUpdateWakefulReceiver" >
-        </receiver>
+        <receiver android:name="com.sdl.mobileweather.weather.WeatherUpdateWakefulReceiver"/>
 
         <meta-data
             android:name="com.google.android.gms.version"