Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7a56d949: Merge "Fix SELinux.java doc errors"

Browse Source 
* commit '7a56d949ef524d00e4091827104ac2450e4ec9db':
  Fix SELinux.java doc errors
This commit is contained in:
Nick Kralevich
2013-09-27 09:35:01 -07:00
committed by Android Git Automerger
parent 4213e68f67 7a56d949ef
commit 19f9f445bf
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/os/SELinux.java
View File

@@ -45,7 +45,7 @@ public class SELinux {
/** /**
* Set whether SELinux is permissive or enforcing. * Set whether SELinux is permissive or enforcing.
* @param boolean representing whether to set SELinux to enforcing * @param value representing whether to set SELinux to enforcing
* @return a boolean representing whether the desired mode was set * @return a boolean representing whether the desired mode was set
*/ */
public static final native boolean setSELinuxEnforce(boolean value); public static final native boolean setSELinuxEnforce(boolean value);
@@ -60,7 +60,7 @@ public class SELinux {
/** /**
* Change the security context of an existing file object. * Change the security context of an existing file object.
* @param path representing the path of file object to relabel. * @param path representing the path of file object to relabel.
* @param con new security context given as a String. * @param context new security context given as a String.
* @return a boolean indicating whether the operation succeeded. * @return a boolean indicating whether the operation succeeded.
*/ */
public static final native boolean setFileContext(String path, String context); public static final native boolean setFileContext(String path, String context);
@@ -87,8 +87,6 @@ public class SELinux {
/** /**
* Gets the security context of a given process id. * Gets the security context of a given process id.
* Use of this function is discouraged for Binder transactions.
* Use Binder.getCallingSecctx() instead.
* @param pid an int representing the process id to check. * @param pid an int representing the process id to check.
* @return a String representing the security context of the given pid. * @return a String representing the security context of the given pid.
*/ */
@@ -102,15 +100,15 @@ public class SELinux {
/** /**
* Gets the value for the given SELinux boolean name. * Gets the value for the given SELinux boolean name.
* @param String The name of the SELinux boolean. * @param name The name of the SELinux boolean.
* @return a boolean indicating whether the SELinux boolean is set. * @return a boolean indicating whether the SELinux boolean is set.
*/ */
public static final native boolean getBooleanValue(String name); public static final native boolean getBooleanValue(String name);
/** /**
* Sets the value for the given SELinux boolean name. * Sets the value for the given SELinux boolean name.
* @param String The name of the SELinux boolean. * @param name The name of the SELinux boolean.
* @param Boolean The new value of the SELinux boolean. * @param value The new value of the SELinux boolean.
* @return a boolean indicating whether or not the operation succeeded. * @return a boolean indicating whether or not the operation succeeded.
*/ */
public static final native boolean setBooleanValue(String name, boolean value); public static final native boolean setBooleanValue(String name, boolean value);