Add PermissionManager to SdlManager

2 files changed, 12 insertions, 8 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/PermissionManager/PermissionManager.java b/sdl_android/src/main/java/com/smartdevicelink/api/PermissionManager/PermissionManager.java
index ecc3e5746..495ab831c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/PermissionManager/PermissionManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/PermissionManager/PermissionManager.java
@@ -57,7 +57,7 @@ import java.util.UUID;
      */
     public PermissionManager(@NonNull ISdl internalInterface){
         super(internalInterface);
-        transitionToState(ManagerState.SETTING_UP);
+        transitionToState(BaseSubManager.SETTING_UP);
         this.currentHMILevel = null;
         this.permissions = new HashMap<>();
         this.filters = new ArrayList<>();
@@ -74,8 +74,8 @@ import java.util.UUID;
         onHMIStatusListener = new OnRPCNotificationListener() {
             @Override
             public void onNotified(RPCNotification notification) {
-                if (currentHMILevel == null && getState() == ManagerState.SETTING_UP){
-                    transitionToState(ManagerState.READY);
+                if (currentHMILevel == null && getState() == BaseSubManager.SETTING_UP){
+                    transitionToState(BaseSubManager.READY);
                 }
                 HMILevel previousHMILevel = currentHMILevel;
                 currentHMILevel = ((OnHMIStatus)notification).getHmiLevel();
@@ -198,7 +198,7 @@ import java.util.UUID;
         // Remove developer's listeners
         filters.clear();
 
-        transitionToState(ManagerState.SHUTDOWN);
+        transitionToState(BaseSubManager.SHUTDOWN);
     }
 
     /**
diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
index be51ebb41..bc7b0e2a8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
@@ -3,6 +3,7 @@ package com.smartdevicelink.api;
 import android.content.Context;
 import android.support.annotation.NonNull;
 
+import com.smartdevicelink.api.PermissionManager.PermissionManager;
 import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
@@ -72,8 +73,8 @@ public class SdlManager implements ProxyBridge.LifecycleListener {
     private AudioStreamManager audioStreamManager;
     private LockscreenManager lockscreenManager;
     private ScreenManager screenManager;
-    private PermissionManager permissionManager;
     */
+	private PermissionManager permissionManager;
 
 	private void initialize(){
 		// instantiate managers
@@ -82,10 +83,11 @@ public class SdlManager implements ProxyBridge.LifecycleListener {
 		this.fileManager = new FileManager(_internalInterface, context);
 		this.lockscreenManager = new LockscreenManager(lockScreenConfig, context, _internalInterface);
 		this.screenManager = new ScreenManager(_internalInterface, this.fileManager);
-		this.permissionManager = new PermissionManager(_internalInterface);
 		this.videoStreamingManager = new VideoStreamingManager(context, _internalInterface);
 		this.audioStreamManager = new AudioStreamManager(_internalInterface);
 		*/
+		this.permissionManager = new PermissionManager(_internalInterface);
+
 	}
 
 	private void dispose() {
@@ -94,10 +96,11 @@ public class SdlManager implements ProxyBridge.LifecycleListener {
 		this.lockscreenManager.dispose();
 		this.audioStreamManager.dispose();
 		this.screenManager.dispose();
-		this.permissionManager.dispose();
 		this.videoStreamingManager.dispose();
 		this.audioStreamManager.dispose();
 		*/
+		this.permissionManager.dispose();
+
 	}
 
 	// BUILDER
@@ -285,9 +288,10 @@ public class SdlManager implements ProxyBridge.LifecycleListener {
 		return lockscreenManager;
 	}
 
+	*/
 	public PermissionManager getPermissionManager() {
 		return permissionManager;
-	}*/
+	}
 
 	// SENDING REQUESTS