Adjusted when updateTargetStateWithErrorState is called. Modified currentScreenDataUpdateListener.onError(updatedState) from null to updatedState.

Author: ChloeMJM

base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java

@@ -242,8 +242,8 @@ void updatePendingOperationsWithFailedScreenState(TextAndGraphicState errorState
                 continue;
             }
             ((TextAndGraphicUpdateOperation) task).setCurrentScreenData(currentScreenData);
+            ((TextAndGraphicUpdateOperation) task).updateTargetStateWithErrorState(errorState);
         }
-        updateOperation.updateTargetStateWithErrorState(errorState);
     }
 
     interface CurrentScreenDataUpdatedListener {

base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java

@@ -202,7 +202,7 @@ public void onResponse(int correlationId, RPCResponse response) {
             internalInterface.get().sendRPC(show);
         } else {
             DebugTool.logInfo(TAG, "ISdl is null Text and Graphic update failed");
-            currentScreenDataUpdateListener.onError(null);
+            currentScreenDataUpdateListener.onError(updatedState);
             finishOperation(false);
             return;
         }
@@ -218,7 +218,7 @@ public void onResponse(int correlationId, RPCResponse response) {
                     updateCurrentScreenDataFromSetDisplayLayout(setLayout);
                 } else {
                     DebugTool.logInfo(TAG, "Text and Graphic SetDisplayLayout failed");
-                    currentScreenDataUpdateListener.onError(null);
+                    currentScreenDataUpdateListener.onError(updatedState);
                 }
                 listener.onComplete(response.getSuccess());
             }
@@ -227,7 +227,7 @@ public void onResponse(int correlationId, RPCResponse response) {
             internalInterface.get().sendRPC(setLayout);
         } else {
             DebugTool.logInfo(TAG, "ISdl is null Text and Graphic update failed");
-            currentScreenDataUpdateListener.onError(null);
+            currentScreenDataUpdateListener.onError(updatedState);
             finishOperation(false);
             return;
         }