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

Merge "Allow PO to check if it is in a managed profile." into nyc-dev

Browse Source
This commit is contained in:
Kenny Guy
2016-04-01 14:23:50 +00:00
committed by Android (Google) Code Review
parent 02424676c6 ffa3840cf3
commit fa7b6723e6
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -5900,6 +5900,7 @@ package android.app.admin {
method public boolean isCallerApplicationRestrictionsManagingPackage(); method public boolean isCallerApplicationRestrictionsManagingPackage();
method public boolean isDeviceOwnerApp(java.lang.String); method public boolean isDeviceOwnerApp(java.lang.String);
method public boolean isLockTaskPermitted(java.lang.String); method public boolean isLockTaskPermitted(java.lang.String);
method public boolean isManagedProfile(android.content.ComponentName);
method public boolean isMasterVolumeMuted(android.content.ComponentName); method public boolean isMasterVolumeMuted(android.content.ComponentName);
method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException; method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
method public boolean isProfileOwnerApp(java.lang.String); method public boolean isProfileOwnerApp(java.lang.String);

1
api/system-current.txt
View File

@@ -6047,6 +6047,7 @@ package android.app.admin {
method public boolean isCallerApplicationRestrictionsManagingPackage(); method public boolean isCallerApplicationRestrictionsManagingPackage();
method public boolean isDeviceOwnerApp(java.lang.String); method public boolean isDeviceOwnerApp(java.lang.String);
method public boolean isLockTaskPermitted(java.lang.String); method public boolean isLockTaskPermitted(java.lang.String);
method public boolean isManagedProfile(android.content.ComponentName);
method public boolean isMasterVolumeMuted(android.content.ComponentName); method public boolean isMasterVolumeMuted(android.content.ComponentName);
method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException; method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
method public boolean isProfileOwnerApp(java.lang.String); method public boolean isProfileOwnerApp(java.lang.String);

1
api/test-current.txt
View File

@@ -5904,6 +5904,7 @@ package android.app.admin {
method public boolean isCallerApplicationRestrictionsManagingPackage(); method public boolean isCallerApplicationRestrictionsManagingPackage();
method public boolean isDeviceOwnerApp(java.lang.String); method public boolean isDeviceOwnerApp(java.lang.String);
method public boolean isLockTaskPermitted(java.lang.String); method public boolean isLockTaskPermitted(java.lang.String);
method public boolean isManagedProfile(android.content.ComponentName);
method public boolean isMasterVolumeMuted(android.content.ComponentName); method public boolean isMasterVolumeMuted(android.content.ComponentName);
method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException; method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
method public boolean isProfileOwnerApp(java.lang.String); method public boolean isProfileOwnerApp(java.lang.String);

3
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -5654,10 +5654,9 @@ public class DevicePolicyManager {
} }
/** /**
* @hide
* Return if this user is a managed profile of another user. An admin can become the profile * Return if this user is a managed profile of another user. An admin can become the profile
* owner of a managed profile with {@link #ACTION_PROVISION_MANAGED_PROFILE} and of a managed * owner of a managed profile with {@link #ACTION_PROVISION_MANAGED_PROFILE} and of a managed
* user with {@link #ACTION_PROVISION_MANAGED_USER}. * user with {@link #createAndManageUser}
* @param admin Which profile owner this request is associated with. * @param admin Which profile owner this request is associated with.
* @return if this user is a managed profile of another user. * @return if this user is a managed profile of another user.
*/ */