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

The profile owner shouldn't control lock task

Browse Source 
Since managed profiles are started on bootup, the managed profile
would be allowed to set an app (possibly itself) as a lock task
app and then run itself on bootup and constantly control the
device.  This privelege should be restricted to device owners.

Change-Id: I4a93aabd6054cbe75076ef0517fce03ffa74dc93
This commit is contained in:
Jason Monk
2014-06-24 11:12:42 -04:00
parent 9e58b3c61c
commit c5185f2bf1
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2349,7 +2349,7 @@ public class DevicePolicyManager {
* <p>Any packages that shares uid with an allowed package will also be allowed
* to activate lock task.
*
* This function can only be called by the device owner or the profile owner.
* This function can only be called by the device owner.
* @param packages The list of packages allowed to enter lock task mode
*
* @see Activity#startLockTask()

10
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -3732,7 +3732,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
/**
* Sets which packages may enter lock task mode.
*
* This function can only be called by the device owner or the profile owner.
* This function can only be called by the device owner.
* @param components The list of components allowed to enter lock task mode.
*/
public void setLockTaskPackages(String[] packages) throws SecurityException {
@@ -3741,15 +3741,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
String[] packageNames = mContext.getPackageManager().getPackagesForUid(uid);
synchronized (this) {
// Check whether any of the package name is the device owner or the profile owner.
// Check whether any of the package name is the device owner.
for (int i=0; i<packageNames.length; i++) {
String packageName = packageNames[i];
int userHandle = UserHandle.getUserId(uid);
String profileOwnerPackage = getProfileOwner(userHandle);
if (isDeviceOwner(packageName) ||
(profileOwnerPackage != null && profileOwnerPackage.equals(packageName))) {
if (isDeviceOwner(packageName)) {
// If a package name is the device owner or the profile owner,
// If a package name is the device owner,
// we update the component list.
DevicePolicyData policy = getUserData(userHandle);
policy.mLockTaskPackages.clear();