1 files changed, 16 insertions, 12 deletions
diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m
index 86b5b711a..0791bfe8a 100644
--- a/SmartDeviceLink/SDLDeviceInfo.m
+++ b/SmartDeviceLink/SDLDeviceInfo.m
@@ -9,6 +9,8 @@
 
 #import "SDLNames.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLDeviceInfo
 
 + (instancetype)currentDevice {
@@ -26,7 +28,7 @@
     return deviceInfo;
 }
 
-- (void)setHardware:(NSString *)hardware {
+- (void)setHardware:(nullable NSString *)hardware {
     if (hardware != nil) {
         [store setObject:hardware forKey:SDLNameHardware];
     } else {
@@ -34,11 +36,11 @@
     }
 }
 
-- (NSString *)hardware {
+- (nullable NSString *)hardware {
     return [store objectForKey:SDLNameHardware];
 }
 
-- (void)setFirmwareRev:(NSString *)firmwareRev {
+- (void)setFirmwareRev:(nullable NSString *)firmwareRev {
     if (firmwareRev != nil) {
         [store setObject:firmwareRev forKey:SDLNameFirmwareRevision];
     } else {
@@ -46,11 +48,11 @@
     }
 }
 
-- (NSString *)firmwareRev {
+- (nullable NSString *)firmwareRev {
     return [store objectForKey:SDLNameFirmwareRevision];
 }
 
-- (void)setOs:(NSString *)os {
+- (void)setOs:(nullable NSString *)os {
     if (os != nil) {
         [store setObject:os forKey:SDLNameOS];
     } else {
@@ -58,11 +60,11 @@
     }
 }
 
-- (NSString *)os {
+- (nullable NSString *)os {
     return [store objectForKey:SDLNameOS];
 }
 
-- (void)setOsVersion:(NSString *)osVersion {
+- (void)setOsVersion:(nullable NSString *)osVersion {
     if (osVersion != nil) {
         [store setObject:osVersion forKey:SDLNameOSVersion];
     } else {
@@ -70,11 +72,11 @@
     }
 }
 
-- (NSString *)osVersion {
+- (nullable NSString *)osVersion {
     return [store objectForKey:SDLNameOSVersion];
 }
 
-- (void)setCarrier:(NSString *)carrier {
+- (void)setCarrier:(nullable NSString *)carrier {
     if (carrier != nil) {
         [store setObject:carrier forKey:SDLNameCarrier];
     } else {
@@ -82,11 +84,11 @@
     }
 }
 
-- (NSString *)carrier {
+- (nullable NSString *)carrier {
     return [store objectForKey:SDLNameCarrier];
 }
 
-- (void)setMaxNumberRFCOMMPorts:(NSNumber<SDLInt> *)maxNumberRFCOMMPorts {
+- (void)setMaxNumberRFCOMMPorts:(nullable NSNumber<SDLInt> *)maxNumberRFCOMMPorts {
     if (maxNumberRFCOMMPorts != nil) {
         [store setObject:maxNumberRFCOMMPorts forKey:SDLNameMaxNumberRFCOMMPorts];
     } else {
@@ -94,8 +96,10 @@
     }
 }
 
-- (NSNumber<SDLInt> *)maxNumberRFCOMMPorts {
+- (nullable NSNumber<SDLInt> *)maxNumberRFCOMMPorts {
     return [store objectForKey:SDLNameMaxNumberRFCOMMPorts];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END