Merge branch 'develop' into feature/issue_1448_generate_deprecated_javadoc

7 files changed, 19 insertions, 2 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
index 5065294a9..31c6da0b1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
@@ -44,6 +45,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
 */
 public class ScreenManager extends BaseScreenManager {
 
+	@RestrictTo(RestrictTo.Scope.LIBRARY)
 	public ScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager) {
 		super(internalInterface, fileManager);
 	}
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
index b7a2e2958..5499d3a5a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
@@ -42,6 +43,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  * SoftButtonManager gives the developer the ability to control how soft buttons are displayed on the head unit.<br>
  * Note: This class must be accessed through the SdlManager->ScreenManager. Do not instantiate it by itself.<br>
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 class SoftButtonManager extends BaseSoftButtonManager {
 
     /**
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
index b5dafa5fd..9f08bef36 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
@@ -1,6 +1,8 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
 /**
@@ -9,6 +11,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
  *
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 class SubscribeButtonManager extends BaseSubscribeButtonManager {
 
     SubscribeButtonManager(@NonNull ISdl internalInterface) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
index 82e9a5e01..fe216ea5f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.R;
 import com.smartdevicelink.managers.file.FileManager;
@@ -46,6 +47,7 @@ import com.smartdevicelink.proxy.rpc.enums.FileType;
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
  *
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 class TextAndGraphicManager extends BaseTextAndGraphicManager {
 
 	TextAndGraphicManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager, @NonNull SoftButtonManager softButtonManager) {
@@ -53,8 +55,8 @@ class TextAndGraphicManager extends BaseTextAndGraphicManager {
 	}
 
 	@Override
-	SdlArtwork getBlankArtwork(){
-		if (blankArtwork == null){
+	SdlArtwork getBlankArtwork() {
+		if (blankArtwork == null) {
 			blankArtwork = new SdlArtwork();
 			blankArtwork.setType(FileType.GRAPHIC_PNG);
 			blankArtwork.setName("blankArtwork");
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java
index 32ff8c0eb..f0895fe22 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.managers.screen.choiceset;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
@@ -42,6 +43,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  * ChoiceSetManager gives the developer the ability to control how soft choice sets are displayed on the head unit.<br>
  * Note: This class must be accessed through the SdlManager->ScreenManager. Do not instantiate it by itself.<br>
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class ChoiceSetManager extends BaseChoiceSetManager {
 
     /**
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
index 4a28a2792..d29312cdf 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
@@ -32,6 +32,8 @@
 
 package com.smartdevicelink.managers.screen.menu;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
@@ -42,6 +44,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  *
  * The MenuManager takes MenuCell objects and creates and sends all necessary RPCs to build out a menu
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class MenuManager extends BaseMenuManager {
 
 	public MenuManager(ISdl internalInterface, FileManager fileManager) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
index a892d3a2c..afde7404d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
@@ -32,6 +32,8 @@
 
 package com.smartdevicelink.managers.screen.menu;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
 /**
@@ -41,6 +43,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  *
  * The VoiceCommandManager takes a List of VoiceCommand objects and sets them on the Head unit for you.
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class VoiceCommandManager extends BaseVoiceCommandManager {
 
 	public VoiceCommandManager(ISdl internalInterface) {