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

Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev

Browse Source
This commit is contained in:
Amith Yamasani
2013-04-12 22:33:05 +00:00
committed by Android (Google) Code Review
parent 0a41431d69 46bc4ebb87
commit e107aa4386
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/current.txt
View File

@@ -17080,23 +17080,22 @@ package android.os {
method public android.os.Bundle getUserRestrictions();
method public android.os.Bundle getUserRestrictions(android.os.UserHandle);
method public boolean isUserAGoat();
method public boolean isUserRestricted();
method public boolean isUserLimited();
method public boolean isUserRunning(android.os.UserHandle);
method public boolean isUserRunningOrStopping(android.os.UserHandle);
method public void setUserRestriction(java.lang.String, boolean);
method public void setUserRestrictions(android.os.Bundle);
method public void setUserRestrictions(android.os.Bundle, android.os.UserHandle);
field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";
field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";
field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi";
field public static final java.lang.String DISALLOW_INSTALL_APPS = "no_install_apps";
field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources";
field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts";
field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user";
field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location";
field public static final java.lang.String DISALLOW_UNINSTALL_APPS = "no_uninstall_apps";
field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";
field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";
field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user";
}
public abstract class Vibrator {

11
core/java/android/os/UserManager.java
View File

@@ -198,16 +198,15 @@ public class UserManager {
}
/**
* Used to check if the user making this call is a restricted user. Restricted users may have
* application restrictions imposed on them. All apps should default to the most restrictive
* version, unless they have specific restrictions available through a call to
* {@link Context#getApplicationRestrictions()}.
* Used to check if the user making this call is a limited user. Limited users may have
* a reduced number of available apps, app restrictions and account restrictions.
* @return whether the user making this call is a limited user
*/
public boolean isUserRestricted() {
public boolean isUserLimited() {
try {
return mService.isRestricted();
} catch (RemoteException re) {
Log.w(TAG, "Could not check if user restricted ", re);
Log.w(TAG, "Could not check if user is limited ", re);
return false;
}
}