Fix merge conflicts

# Conflicts:
#	ffw/UIRPC.js

Author: Jack-Byrne

app/model/sdl/Abstract/AppModel.js

@@ -74,9 +74,9 @@ SDL.ABSAppModel = Em.Object.extend(
       return this.mediaPlayerIndicator ===
         SDL.SDLModel.data.mediaPlayerIndicatorEnum.PLAY_PAUSE;
     }.property('this.mediaPlayerIndicator'),
-    bufferingIndicator: function() {
+    stopIndicator: function() {
       return this.mediaPlayerIndicator ===
-      SDL.SDLModel.data.mediaPlayerIndicatorEnum.BUFFERING ? 'BUFFERING' : null;
+      SDL.SDLModel.data.mediaPlayerIndicatorEnum.STOP ? 'STOP' : null;
     }.property('this.mediaPlayerIndicator'),
     /**
      * Application's container for current processed requests on HMI

app/model/sdl/Abstract/data.js

@@ -59,7 +59,7 @@ SDL.SDLModelData = Em.Object.create(
       'PLAY_PAUSE': 0,
       'PLAY': 1,
       'PAUSE': 2,
-      'BUFFERING': 3
+      'STOP': 3
     },
     /**
      * Structure specified for PoliceUpdate retry sequence

app/view/info/nonMediaView.js

@@ -95,7 +95,7 @@ SDL.InfoNonMedia = Em.ContainerView.create(
             ],
 
             template: Ember.Handlebars.compile(
-              '<img width="150px" {{bindAttr src="SDL.SDLController.model.appInfo.mainImage"}}>'
+              '<img width="150px" onerror="this.style.display=\'none\'" {{bindAttr src="SDL.SDLController.model.appInfo.mainImage"}}>'
             )
           }
         ),
@@ -113,7 +113,7 @@ SDL.InfoNonMedia = Em.ContainerView.create(
 
             field1: SDL.Label.extend(
               {
-                contentBinding: 'controller.model.appInfo.field1',
+                contentBinding: 'SDL.SDLController.model.appInfo.field1',
                 attributeBindings: ['style'],
                 style: function() {
                   if (SDL.SDLController.model) {
@@ -127,7 +127,7 @@ SDL.InfoNonMedia = Em.ContainerView.create(
 
             field2: SDL.Label.extend(
               {
-                contentBinding: 'controller.model.appInfo.field2',
+                contentBinding: 'SDL.SDLController.model.appInfo.field2',
                 attributeBindings: ['style'],
                 style: function() {
                   if (SDL.SDLController.model) {
@@ -141,13 +141,13 @@ SDL.InfoNonMedia = Em.ContainerView.create(
 
             field3: SDL.Label.extend(
               {
-                contentBinding: 'controller.model.appInfo.field3'
+                contentBinding: 'SDL.SDLController.model.appInfo.field3'
               }
             ),
 
             field4: SDL.Label.extend(
               {
-                contentBinding: 'controller.model.appInfo.field4'
+                contentBinding: 'SDL.SDLController.model.appInfo.field4'
               }
             )
 

app/view/media/sdl/controllsView.js

@@ -56,8 +56,8 @@ SDL.SDLMediaControlls = Em.ContainerView.create(
             '<div class="album textLimit" {{bindAttr style="SDL.SDLController.model.appInfo.alignment"}}>{{SDL.SDLController.model.appInfo.field2}}</div>' +
             '<div class="artist textLimit"{{bindAttr class="SDL.SDLController.model.mediaPreset:hidden"}}>{{SDL.SDLController.model.appInfo.field3}}</div>' +
             '<div class="time"{{bindAttr class="SDL.SDLController.model.mediaPreset:timeV2"}}>{{SDL.SDLController.model.appInfo.mediaClock}}</div>' +
-            '<img class="cd_logo" {{bindAttr class="SDL.SDLController.model.mediaPreset:cd_logoV2"}} {{bindAttr class="SDL.SDLController.model.mode"}} {{bindAttr class="SDL.SDLController.model.isTemplate"}}/>' +       
-            '<img class="cd_logo" {{bindAttr src="SDL.SDLController.model.appInfo.trackIcon" class="SDL.SDLController.model.mediaPreset:cd_logoV2"}} />' +       
+            '<img class="cd_logo" onerror="this.style.display=\'none\'" {{bindAttr class="SDL.SDLController.model.mediaPreset:cd_logoV2"}} {{bindAttr class="SDL.SDLController.model.mode"}} {{bindAttr class="SDL.SDLController.model.isTemplate"}}/>' +       
+            '<img class="cd_logo" onerror="this.style.display=\'none\'" {{bindAttr src="SDL.SDLController.model.appInfo.trackIcon" class="SDL.SDLController.model.mediaPreset:cd_logoV2"}} />' +       
             '</div>' + '{{/with}}'
           )
       }
@@ -94,7 +94,7 @@ SDL.SDLMediaControlls = Em.ContainerView.create(
             ],
             //classNameBindings: 'SDL.SDLController.model.PLAY_PAUSE::unsubscribed',
             presetName: 'PLAY_PAUSE',
-            textBinding: 'SDL.SDLController.model.bufferingIndicator',
+            textBinding: 'SDL.SDLController.model.stopIndicator',
             actionUp: function() {
               SDL.SDLController.onSoftButtonOkActionUp(this.presetName);
             },

capabilities/display_capabilities.js

@@ -2,6 +2,7 @@ SDL.templateCapabilities = {
     "MEDIA": {
         "displayCapabilities": {
             "displayType": "GEN2_8_DMA",
+            "displayName": "SDL_HMI",
             "textFields": [{
                     "name": "mainField1",
                     "characterSet": "TYPE2SET",
@@ -442,6 +443,7 @@ SDL.templateCapabilities = {
     "ONSCREEN_PRESETS": {
         "displayCapabilities": {
             "displayType": "GEN2_8_DMA",
+            "displayName": "SDL_HMI",
             "textFields": [{
                     "name": "mainField1",
                     "characterSet": "TYPE2SET",
@@ -877,6 +879,7 @@ SDL.templateCapabilities = {
     "NON-MEDIA": {
         "displayCapabilities": {
             "displayType": "GEN2_8_DMA",
+            "displayName": "SDL_HMI",
             "textFields": [{
                     "name": "mainField1",
                     "characterSet": "TYPE2SET",
@@ -1324,6 +1327,7 @@ SDL.templateCapabilities = {
     "NAV_FULLSCREEN_MAP": {
         "displayCapabilities": {
             "displayType": "GEN2_8_DMA",
+            "displayName": "SDL_HMI",
             "textFields": [{
                     "name": "mainField1",
                     "characterSet": "TYPE2SET",

capabilities/rc_capabilities.js

@@ -133,6 +133,24 @@ SDL.remoteControlCapability =
         keepContextAvailable: true,
         equalizerMaxChannelId: 10
     }],
+    seatControlCapabilities: [{
+      moduleName: "Seat",
+      heatingEnabledAvailable: true,
+      coolingEnabledAvailable: true,
+      heatingLevelAvailable: true,
+      coolingLevelAvailable: true,
+      horizontalPositionAvailable: true,
+      verticalPositionAvailable: true,
+      frontVerticalPositionAvailable: true,
+      backVerticalPositionAvailable: true,
+      backTiltAngleAvailable: true,
+      headSupportHorizontalPositionAvailable: true,
+      headSupportVerticalPositionAvailable: true,
+      massageEnabledAvailable: true,
+      massageModeAvailable: true,
+      massageCushionFirmnessAvailable: true,
+      memoryAvailable: true
+   }],
     lightControlCapabilities: {
         moduleName: 'light',
         supportedLights: [{

ffw/UIRPC.js

@@ -296,6 +296,9 @@ FFW.UI = FFW.RPCObserver.create(
               if(request.params.enableSeek) {
                 this.OnSeekMediaClockTimer(request.params.startTime, request.params.appID);
               }
+              if(request.params.audioStreamingIndicator) {
+                SDL.SDLController.SetAudioStreamingIndicator(request.params)
+              }
               this.sendUIResult(resultCode, request.id, request.method);
             } else {
               this.sendError(
@@ -489,6 +492,7 @@ FFW.UI = FFW.RPCObserver.create(
               'result': {
                 'displayCapabilities': {
                   'displayType': 'GEN2_8_DMA',
+                  'displayName': 'SDL_HMI',
                   'textFields': [
                     {
                       'name': 'mainField1',