Remove SELinux additions from public API

Change-Id: If2e076312b0e411145c1cd900f3ae20d998a0f24

3 files changed, 15 insertions, 15 deletions

diff --git a/api/current.txt b/api/current.txt
index e188121..0ff0fbc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4220,7 +4220,6 @@ package android.app.admin {
     field public static final int USES_ENCRYPTED_STORAGE = 7; // 0x7
     field public static final int USES_POLICY_DISABLE_CAMERA = 8; // 0x8
     field public static final int USES_POLICY_DISABLE_KEYGUARD_FEATURES = 9; // 0x9
-    field public static final int USES_POLICY_ENFORCE_SELINUX = 10; // 0xa
     field public static final int USES_POLICY_EXPIRE_PASSWORD = 6; // 0x6
     field public static final int USES_POLICY_FORCE_LOCK = 3; // 0x3
     field public static final int USES_POLICY_LIMIT_PASSWORD = 0; // 0x0
@@ -4271,21 +4270,15 @@ package android.app.admin {
     method public int getPasswordMinimumSymbols(android.content.ComponentName);
     method public int getPasswordMinimumUpperCase(android.content.ComponentName);
     method public int getPasswordQuality(android.content.ComponentName);
-    method public java.util.List<java.lang.String> getSELinuxBooleanNames(android.content.ComponentName);
-    method public boolean getSELinuxBooleanValue(android.content.ComponentName, java.lang.String);
-    method public boolean getSELinuxEnforcing(android.content.ComponentName);
     method public boolean getStorageEncryption(android.content.ComponentName);
     method public int getStorageEncryptionStatus();
     method public boolean hasGrantedPolicy(android.content.ComponentName, int);
     method public boolean isActivePasswordSufficient();
     method public boolean isAdminActive(android.content.ComponentName);
-    method public boolean isCustomPolicyFile(android.content.ComponentName, int);
-    method public boolean isSELinuxAdmin(android.content.ComponentName);
     method public void lockNow();
     method public void removeActiveAdmin(android.content.ComponentName);
     method public boolean resetPassword(java.lang.String, int);
     method public void setCameraDisabled(android.content.ComponentName, boolean);
-    method public boolean setCustomPolicyFile(android.content.ComponentName, int, byte[]);
     method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);
     method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
     method public void setMaximumTimeToLock(android.content.ComponentName, long);
@@ -4299,9 +4292,6 @@ package android.app.admin {
     method public void setPasswordMinimumSymbols(android.content.ComponentName, int);
     method public void setPasswordMinimumUpperCase(android.content.ComponentName, int);
     method public void setPasswordQuality(android.content.ComponentName, int);
-    method public boolean setSELinuxAdmin(android.content.ComponentName, boolean);
-    method public boolean setSELinuxBooleanValue(android.content.ComponentName, java.lang.String, boolean);
-    method public boolean setSELinuxEnforcing(android.content.ComponentName, boolean);
     method public int setStorageEncryption(android.content.ComponentName, boolean);
     method public void wipeData(int);
     field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN";
@@ -4325,11 +4315,6 @@ package android.app.admin {
     field public static final int PASSWORD_QUALITY_SOMETHING = 65536; // 0x10000
     field public static final int PASSWORD_QUALITY_UNSPECIFIED = 0; // 0x0
     field public static final int RESET_PASSWORD_REQUIRE_ENTRY = 1; // 0x1
-    field public static final int SEPOLICY_FILE_COUNT = 4; // 0x4
-    field public static final int SEPOLICY_FILE_FILECTXS = 2; // 0x2
-    field public static final int SEPOLICY_FILE_PROPCTXS = 1; // 0x1
-    field public static final int SEPOLICY_FILE_SEAPPCTXS = 3; // 0x3
-    field public static final int SEPOLICY_FILE_SEPOLICY = 0; // 0x0
     field public static final int WIPE_EXTERNAL_STORAGE = 1; // 0x1
   }
 
diff --git a/core/java/android/app/admin/DeviceAdminInfo.java b/core/java/android/app/admin/DeviceAdminInfo.java
index 6849a96..85031cc 100644
--- a/core/java/android/app/admin/DeviceAdminInfo.java
+++ b/core/java/android/app/admin/DeviceAdminInfo.java
@@ -147,6 +147,7 @@ public final class DeviceAdminInfo implements Parcelable {
     public static final int USES_POLICY_DISABLE_KEYGUARD_FEATURES = 9;
 
     /**
+     * @hide
      * A type of policy that this device admin can use: enforce SELinux policy.
      *
      * <p>To control this policy, the device admin must have a "enforce-selinux"
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index a80898e..b0fe60b 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -1442,6 +1442,7 @@ public class DevicePolicyManager {
      * wishes to give back control of SELinux
      * @return true if the operation succeeded, false if the operation failed or
      * SELinux was not enabled on the device.
+     * @hide
      */
     public boolean setSELinuxAdmin(ComponentName admin, boolean control) {
         return setSELinuxAdmin(admin, control, UserHandle.myUserId());
@@ -1469,6 +1470,7 @@ public class DevicePolicyManager {
      * @param admin Which {@link DeviceAdminReceiver} this request is associated,
      * must be self
      * @return true if admin app can control SELinux policy, false otherwise
+     * @hide
      */
     public boolean isSELinuxAdmin(ComponentName admin) {
         return isSELinuxAdmin(admin, UserHandle.myUserId());
@@ -1496,6 +1498,7 @@ public class DevicePolicyManager {
      * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
      * @param enforcing true for enforcing mode, false for permissive mode.
      * @return false if Android was unable to set the desired mode
+     * @hide
      */
     public boolean setSELinuxEnforcing(ComponentName admin, boolean enforcing) {
         return setSELinuxEnforcing(admin, enforcing, UserHandle.myUserId());
@@ -1525,6 +1528,7 @@ public class DevicePolicyManager {
      * SELinux admin.
      *
      * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
+     * @hide
      */
     public boolean getSELinuxEnforcing(ComponentName admin) {
         return getSELinuxEnforcing(admin, UserHandle.myUserId());
@@ -1553,6 +1557,7 @@ public class DevicePolicyManager {
      * SELinux admin.
      *
      * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
+     * @hide
      */
     public List<String> getSELinuxBooleanNames(ComponentName admin) {
         return getSELinuxBooleanNames(admin, UserHandle.myUserId());
@@ -1583,6 +1588,7 @@ public class DevicePolicyManager {
      * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
      * @param name the name of the SELinux boolean
      * @return the value of the SELinux boolean
+     * @hide
      */
     public boolean getSELinuxBooleanValue(ComponentName admin, String name) {
         return getSELinuxBooleanValue(admin, name, UserHandle.myUserId());
@@ -1614,6 +1620,7 @@ public class DevicePolicyManager {
      * @param name the name of the SELinux boolean
      * @param value the desired value for the boolean
      * @return false if Android was unable to set the desired mode
+     * @hide
      */
     public boolean setSELinuxBooleanValue(ComponentName admin, String name,
             boolean value) {
@@ -1635,10 +1642,15 @@ public class DevicePolicyManager {
 
     // Before changing these values, be sure to update
     // DevicePolicyManagerService.java's POLICY_DESCRIPTIONS array.
+    /** @hide */
     public static final int SEPOLICY_FILE_SEPOLICY = 0;
+    /** @hide */
     public static final int SEPOLICY_FILE_PROPCTXS = 1;
+    /** @hide */
     public static final int SEPOLICY_FILE_FILECTXS = 2;
+    /** @hide */
     public static final int SEPOLICY_FILE_SEAPPCTXS = 3;
+    /** @hide */
     public static final int SEPOLICY_FILE_COUNT = SEPOLICY_FILE_SEAPPCTXS+1;
 
     /**
@@ -1665,6 +1677,7 @@ public class DevicePolicyManager {
      * @param policy the new policy file in bytes, or null if you wish to revert to
      * the default policy
      * @return false if Android was unable to set the new policy
+     * @hide
      */
     public boolean setCustomPolicyFile(ComponentName admin, int policyType, byte[] policy) {
         return setCustomPolicyFile(admin, policyType, policy, UserHandle.myUserId());
@@ -1700,6 +1713,7 @@ public class DevicePolicyManager {
      * @param policyType one of {@link #SEPOLICY_FILE_SEPOLICY}, {@link #SEPOLICY_FILE_PROPCTXS},
      * {@link #SEPOLICY_FILE_FILECTXS}, or {@link #SEPOLICY_FILE_SEAPPCTXS}
      * @return true if the admin set a custom policy file
+     * @hide
      */
     public boolean isCustomPolicyFile(ComponentName admin, int policyType) {
         return isCustomPolicyFile(admin, policyType, UserHandle.myUserId());