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

Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55

Browse Source 
am: db9d529499

* commit 'db9d529499cc635c5ce3d0a4d5b44f2211afaef6':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: I12805ef5c1a7039ccad07e31f84231cc703dd470
This commit is contained in:
Tony Mak
2016-05-18 17:18:36 +00:00
committed by android-build-merger
parent 59a6ac7daa db9d529499
commit d412dfc2a8
4 changed files with 22 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5061,26 +5061,6 @@ public class DevicePolicyManager {
return ret == null ? new Bundle() : ret;
}
/**
* Called by the system to get the user restrictions for a user.
*
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @param userHandle user id the admin is running as.
*
* @hide
*/
public Bundle getUserRestrictionsForUser(@NonNull ComponentName admin, int userHandle) {
Bundle ret = null;
if (mService != null) {
try {
ret = mService.getUserRestrictionsForUser(admin, userHandle);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
return ret == null ? new Bundle() : ret;
}
/**
* Called by profile or device owners to hide or unhide packages. When a package is hidden it is
* unavailable for use, but the data and actual package file remain.

1
core/java/android/app/admin/IDevicePolicyManager.aidl
View File

@@ -174,7 +174,6 @@ interface IDevicePolicyManager {
void setUserRestriction(in ComponentName who, in String key, boolean enable);
Bundle getUserRestrictions(in ComponentName who);
Bundle getUserRestrictionsForUser(in ComponentName who, int userId);
void addCrossProfileIntentFilter(in ComponentName admin, in IntentFilter filter, int flags);
void clearCrossProfileIntentFilters(in ComponentName admin);