From 6af05fa75b395357e539ad9e83939bbb02abaaaa Mon Sep 17 00:00:00 2001
From: Pasindu <pasinduonline@gmail.com>
Date: Fri, 23 Jun 2017 13:01:51 +0530
Subject: [PATCH] Fix formatting and unwanted vars

---
 .../carbon/mdm/services/android/util/AndroidConstants.java  | 6 ------
 .../public/templates/android-policy-edit.hbs                | 2 +-
 .../src/main/resources/devicetypes/android.xml              | 4 ----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java
index 7e62e5906..7627b7da4 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java
@@ -104,12 +104,6 @@ public final class AndroidConstants {
         public static final String APP_RESTRICTION = "APP-RESTRICTION";
         public static final String WORK_PROFILE = "WORK_PROFILE";
     }
-
-    public final class RuntimePermissionType {
-        public static final String PERMISSION_POLICY_PROMPT = "PERMISSION_POLICY_PROMPT";
-        public static final String PERMISSION_POLICY_AUTO_GRANT = "PERMISSION_POLICY_AUTO_GRANT";
-        public static final String PERMISSION_POLICY_AUTO_DENY = "PERMISSION_POLICY_AUTO_DENY";
-    }
     public final class StatusCodes {
         private StatusCodes() {
             throw new AssertionError();
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
index 4c0cb2771..5736e69a0 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
@@ -100,7 +100,7 @@
             <a href="javascript:void(0)" onclick="showAdvanceOperation('runtime-permission-policy', this)">
             <span class="fw-stack fw-lg">
                 <i class="fw fw-application fw-stack-1x"></i>
-                <i class="fw fw-block fw-stack-2x"></i>
+                <i class="fw fw-rules fw-stack-2x"></i>
             </span>
                 Runtime Permission Policy (COSU)
                 <span id="runtime-permission-policy-configured" class="has-configured status-icon hidden"><i
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index 415d7bc3c..38d88d3db 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -193,10 +193,6 @@
             <Name>Password Policy</Name>
             <Description>Set passcode policy</Description>
         </Feature>
-        <Feature code="RUNTIME_PERMISSION_POLICY">
-            <Name>Runtime Permission Policy</Name>
-            <Description>Set runtime permission</Description>
-        </Feature>
         <Feature code="VPN">
             <Name>Configure VPN</Name>
             <Description>Configure VPN settings</Description>