Skip to content

Commit b232716

Browse files
noah-livionoah-livio
committed
Revert out of scope changes
1 parent b2bf542 commit b232716

120 files changed

Lines changed: 4403 additions & 4430 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@RunWith(AndroidJUnit4.class)
2525
public class TransportBrokerTest { //FIXME this test class needs to be fixed. At this point these tests are not helpful
2626
RouterServiceValidator rsvp;
27-
// public TransportBrokerThread(Context context, String appId, ComponentName service){
27+
// public TransportBrokerThread(Context context, String appId, ComponentName service){
2828

2929
@Before
3030
public void setUp() throws Exception {

‎android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ private void checkTrustedRouter(final ValidationStatusCallback callback, final P
233233
* @param context
234234
*/
235235
//private void retrieveBestRouterServiceName(Context context) {
236-
// FindRouterTask task = new FindRouterTask(null);
237-
// task.execute(context);
236+
// FindRouterTask task = new FindRouterTask(null);
237+
// task.execute(context);
238238
//}
239239

240240
/**

‎android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,9 +1692,9 @@ private boolean bluetoothAvailable() {
16921692
}
16931693

16941694
/**
1695-
* 1. If the app has SDL shut off, shut down
1696-
* 2. if The app has an Alt Transport address or was started by one, stay open
1697-
* 3. If Bluetooth is off/NA shut down
1695+
* 1. If the app has SDL shut off, shut down
1696+
* 2. if The app has an Alt Transport address or was started by one, stay open
1697+
* 3. If Bluetooth is off/NA shut down
16981698
* 4. Anything else
16991699
*/
17001700
public boolean shouldServiceRemainOpen(Intent intent) {

‎base/src/main/java/com/smartdevicelink/managers/screen/PresentAlertOperation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
/**
6464
* Operation that handles uploading images and audio data needed by the alert and, once the data uploads are complete, sending the alert.
65-
*
65+
*
6666
* Created by Julian Kast on 12/10/20.
6767
*/
6868
public class PresentAlertOperation extends Task {

‎base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,7 @@ private void handleSingleFrameMessageFrame(SdlPacket packet) {
15661566
* This method will return copy of active transports
15671567
*
15681568
* @return a list of active transports
1569-
*/
1569+
* */
15701570
public List<TransportRecord> getActiveTransports() {
15711571
List<TransportRecord> records = new ArrayList<>();
15721572
for (TransportRecord record : activeTransports.values()) {

‎base/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333

3434

3535
public enum MessageType {
36-
// START_SESSION,
37-
// START_SESSION_ACK,
38-
// START_SESSION_NACK,
39-
// END_SESSION,
36+
// START_SESSION,
37+
// START_SESSION_ACK,
38+
// START_SESSION_NACK,
39+
// END_SESSION,
4040
UNDEFINED,
4141
BULK,
4242
RPC;

‎base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -69,45 +69,45 @@
6969
*
7070
* <p><b>Parameter List</b></p>
7171
* <table border="1" rules="all">
72-
* <tr>
73-
* <th>Param Name</th>
74-
* <th>Type</th>
75-
* <th>Description</th>
72+
* <tr>
73+
* <th>Param Name</th>
74+
* <th>Type</th>
75+
* <th>Description</th>
7676
* <th> Req.</th>
77-
* <th>Notes</th>
78-
* <th>Version Available</th>
79-
* </tr>
80-
* <tr>
81-
* <td>cmdID</td>
82-
* <td> Integer</td>
83-
* <td>unique ID of the command to add</td>
77+
* <th>Notes</th>
78+
* <th>Version Available</th>
79+
* </tr>
80+
* <tr>
81+
* <td>cmdID</td>
82+
* <td> Integer</td>
83+
* <td>unique ID of the command to add</td>
8484
* <td>Y</td>
85-
* <td> minvalue:0; maxvalue:2000000000</td>
86-
* <td>SmartDeviceLink 1.0</td>
87-
* <tr>
88-
* <td>menuParams</td>
89-
* <td>ButtonName</td>
90-
* <td>Name of the button to unsubscribe.</td>
85+
* <td> minvalue:0; maxvalue:2000000000</td>
86+
* <td>SmartDeviceLink 1.0</td>
87+
* <tr>
88+
* <td>menuParams</td>
89+
* <td>ButtonName</td>
90+
* <td>Name of the button to unsubscribe.</td>
9191
* <td>Y</td>
92-
* <td></td>
93-
* <td>SmartDeviceLink 1.0</td>
94-
* </tr>
95-
* <tr>
96-
* <td>vrCommands</td>
97-
* <td>String</td>
98-
* <td><p>An array of strings to be used as VR synonyms for this command.</p> <p>If this array is provided, it may not be empty.</p></td>
92+
* <td></td>
93+
* <td>SmartDeviceLink 1.0</td>
94+
* </tr>
95+
* <tr>
96+
* <td>vrCommands</td>
97+
* <td>String</td>
98+
* <td><p>An array of strings to be used as VR synonyms for this command.</p> <p>If this array is provided, it may not be empty.</p></td>
9999
* <td>N</td>
100-
* <td>minsize:1; maxsize:100</td>
101-
* <td>SmartDeviceLink 1.0</td>
102-
* <tr>
103-
* <td>cmdIcon</td>
104-
* <td>Image</td>
105-
* <td><p>Image struct determining whether static or dynamic icon.</p><p>If omitted on supported displays, no (or the default if applicable) icon shall be displayed.</p></td>
100+
* <td>minsize:1; maxsize:100</td>
101+
* <td>SmartDeviceLink 1.0</td>
102+
* <tr>
103+
* <td>cmdIcon</td>
104+
* <td>Image</td>
105+
* <td><p>Image struct determining whether static or dynamic icon.</p><p>If omitted on supported displays, no (or the default if applicable) icon shall be displayed.</p></td>
106106
* <td>N</td>
107-
* <td></td>
108-
* <td>SmartDeviceLink 1.0</td>
109-
* </tr>
110-
* <tr>
107+
* <td></td>
108+
* <td>SmartDeviceLink 1.0</td>
109+
* </tr>
110+
* <tr>
111111
* <td>secondaryImage</td>
112112
* <td>Image</td>
113113
* <td>Optional secondary image struct for menu cell</td>

‎base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -50,62 +50,62 @@
5050
*
5151
* <p><b>Parameter List</b></p>
5252
* <table border="1" rules="all">
53-
* <tr>
54-
* <th>Param Name</th>
55-
* <th>Type</th>
56-
* <th>Description</th>
53+
* <tr>
54+
* <th>Param Name</th>
55+
* <th>Type</th>
56+
* <th>Description</th>
5757
* <th> Req.</th>
58-
* <th>Notes</th>
59-
* <th>Version Available</th>
60-
* </tr>
61-
* <tr>
62-
* <td>menuID</td>
63-
* <td>Integer</td>
64-
* <td>Unique ID that identifies this sub menu. This value is used in AddCommand to which SubMenu is the parent of the command being added.</td>
58+
* <th>Notes</th>
59+
* <th>Version Available</th>
60+
* </tr>
61+
* <tr>
62+
* <td>menuID</td>
63+
* <td>Integer</td>
64+
* <td>Unique ID that identifies this sub menu. This value is used in AddCommand to which SubMenu is the parent of the command being added.</td>
6565
* <td>Y</td>
66-
* <td></td>
67-
* <td>SmartDeviceLink 1.0</td>
68-
* </tr>
69-
* <tr>
70-
* <td>position</td>
71-
* <td>Integer</td>
72-
* <td>Position within the items of the top level Command Menu. 0 will insert at the front, 1 will insert after the first existing element, etc. Position of any submenu will always be located before the return and exit options.</td>
66+
* <td></td>
67+
* <td>SmartDeviceLink 1.0</td>
68+
* </tr>
69+
* <tr>
70+
* <td>position</td>
71+
* <td>Integer</td>
72+
* <td>Position within the items of the top level Command Menu. 0 will insert at the front, 1 will insert after the first existing element, etc. Position of any submenu will always be located before the return and exit options.</td>
7373
* <td>N</td>
74-
* <td>Min Value: 0 <p>Max Value: 1000</p> <p>If position is greater or equal than the number of items on top level, the sub menu will be appended by the end.</p><p>If this parameter is omitted, the entry will be added at the end of the list.</P></td>
75-
* <td>SmartDeviceLink 1.0</td>
76-
* </tr>
77-
* <tr>
78-
* <td>menuName</td>
79-
* <td>String</td>
80-
* <td>Text which is displayed representing this submenu item</td>
74+
* <td>Min Value: 0 <p>Max Value: 1000</p> <p>If position is greater or equal than the number of items on top level, the sub menu will be appended by the end.</p><p>If this parameter is omitted, the entry will be added at the end of the list.</P></td>
75+
* <td>SmartDeviceLink 1.0</td>
76+
* </tr>
77+
* <tr>
78+
* <td>menuName</td>
79+
* <td>String</td>
80+
* <td>Text which is displayed representing this submenu item</td>
8181
* <td>Y</td>
82-
* <td>maxlength:500</td>
83-
* <td>SmartDeviceLink 1.0</td>
84-
* </tr>
85-
* <tr>
86-
* <td>menuIcon</td>
87-
* <td>Image</td>
88-
* <td>Image to be be shown along with the submenu item</td>
82+
* <td>maxlength:500</td>
83+
* <td>SmartDeviceLink 1.0</td>
84+
* </tr>
85+
* <tr>
86+
* <td>menuIcon</td>
87+
* <td>Image</td>
88+
* <td>Image to be be shown along with the submenu item</td>
8989
* <td>N</td>
90-
* <td></td>
91-
* <td>SmartDeviceLink 5.0</td>
92-
* </tr>
93-
* <tr>
94-
* <td>menuLayout</td>
95-
* <td>MenuLayout</td>
96-
* <td>Sets the layout of the submenu screen.</td>
97-
* <td></td>
98-
* <td></td>
99-
* <td>SmartDeviceLink 6.0</td>
100-
* </tr>
101-
* <tr>
102-
* <td>parentID</td>
103-
* <td>Integer</td>
104-
* <td>unique ID of the sub menu, the command will be added to. If not provided or 0, it will be provided to the top level of the in application menu.</td>
105-
* <td>N</td>
106-
* <td>Min Value: 0 <p>Max Value: 2000000000</p> </td>
107-
* <td>SmartDeviceLink 7.0.0</td>
108-
* </tr>
90+
* <td></td>
91+
* <td>SmartDeviceLink 5.0</td>
92+
* </tr>
93+
* <tr>
94+
* <td>menuLayout</td>
95+
* <td>MenuLayout</td>
96+
* <td>Sets the layout of the submenu screen.</td>
97+
* <td></td>
98+
* <td></td>
99+
* <td>SmartDeviceLink 6.0</td>
100+
* </tr>
101+
* <tr>
102+
* <td>parentID</td>
103+
* <td>Integer</td>
104+
* <td>unique ID of the sub menu, the command will be added to. If not provided or 0, it will be provided to the top level of the in application menu.</td>
105+
* <td>N</td>
106+
* <td>Min Value: 0 <p>Max Value: 2000000000</p> </td>
107+
* <td>SmartDeviceLink 7.0.0</td>
108+
* </tr>
109109
* <tr>
110110
* <td>secondaryText</td>
111111
* <td>String</td>
@@ -332,7 +332,7 @@ public Integer getParentID() {
332332
* Sets the secondaryText.
333333
*
334334
* @param secondaryText Optional secondary text to display
335-
* {"string_min_length": 1, "string_max_length": 500}
335+
* {"string_min_length": 1, "string_max_length": 500}
336336
* @since SmartDeviceLink 7.1.0
337337
*/
338338
public AddSubMenu setSecondaryText(String secondaryText) {
@@ -355,7 +355,7 @@ public String getSecondaryText() {
355355
* Sets the tertiaryText.
356356
*
357357
* @param tertiaryText Optional tertiary text to display
358-
* {"string_min_length": 1, "string_max_length": 500}
358+
* {"string_min_length": 1, "string_max_length": 500}
359359
* @since SmartDeviceLink 7.1.0
360360
*/
361361
public AddSubMenu setTertiaryText(String tertiaryText) {

0 commit comments

Comments
 (0)