community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unintentional changes happended during mergings

Browse Source
This commit is contained in:
Pasindu 2017-06-23 13:54:33 +05:30
parent 6af05fa75b
commit e3f7466482
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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
View File

@ -79,7 +79,6 @@ public final class AndroidConstants {
public static final String WIFI = "WIFI"; public static final String WIFI = "WIFI";
public static final String CAMERA = "CAMERA"; public static final String CAMERA = "CAMERA";
public static final String DEVICE_MUTE = "DEVICE_MUTE"; public static final String DEVICE_MUTE = "DEVICE_MUTE";
public static final String RUNTIME_PERMISSION_POLICY = "RUNTIME_PERMISSION_POLICY";
public static final String PASSCODE_POLICY = "PASSCODE_POLICY"; public static final String PASSCODE_POLICY = "PASSCODE_POLICY";
public static final String DEVICE_INFO = "DEVICE_INFO"; public static final String DEVICE_INFO = "DEVICE_INFO";
public static final String ENTERPRISE_WIPE = "ENTERPRISE_WIPE"; public static final String ENTERPRISE_WIPE = "ENTERPRISE_WIPE";

1
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/business-controllers/policy.js
View File

@ -1,3 +1,4 @@
/*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
* *
* WSO2 Inc. licenses this file to you under the Apache License, * WSO2 Inc. licenses this file to you under the Apache License,

2
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-wizard/public/js/android-policy-operations.js
View File

@ -32,7 +32,7 @@ var androidOperationConstants = {
"APPLICATION_OPERATION": "app-restriction", "APPLICATION_OPERATION": "app-restriction",
"APPLICATION_OPERATION_CODE": "APP-RESTRICTION", "APPLICATION_OPERATION_CODE": "APP-RESTRICTION",
"KIOSK_APPS_CODE": "KIOSK_APPS", "KIOSK_APPS_CODE": "KIOSK_APPS",
"KIOSK_APPS": "cosu-whitelisted-applications", "KIOSK_APPS": "cosu-whitelisted-applications"
}; };
/** /**