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

Merge "Proper security labeling of multi-user data directories."

Browse Source
This commit is contained in:
Nick Kralevich
2013-09-20 19:35:16 +00:00
committed by Gerrit Code Review
parent 69aa2f8a05 8643dc6b70
commit effefbc48f
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/pm/Installer.java
View File

@@ -265,7 +265,7 @@ public final class Installer {
return execute(builder.toString());
}
public int createUserData(String name, int uid, int userId) {
public int createUserData(String name, int uid, int userId, String seinfo) {
StringBuilder builder = new StringBuilder("mkuserdata");
builder.append(' ');
builder.append(name);
@@ -273,6 +273,8 @@ public final class Installer {
builder.append(uid);
builder.append(' ');
builder.append(userId);
builder.append(' ');
builder.append(seinfo != null ? seinfo : "!");
return execute(builder.toString());
}

2
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -3816,7 +3816,7 @@ public class PackageManagerService extends IPackageManager.Stub {
for (int user : users) {
if (user != 0) {
res = mInstaller.createUserData(packageName,
UserHandle.getUid(user, uid), user);
UserHandle.getUid(user, uid), user, seinfo);
if (res < 0) {
return res;
}

3
services/java/com/android/server/pm/Settings.java
View File

@@ -2459,7 +2459,8 @@ final class Settings {
ps.setInstalled((ps.pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0, userHandle);
// Need to create a data directory for all apps under this user.
installer.createUserData(ps.name,
UserHandle.getUid(userHandle, ps.appId), userHandle);
UserHandle.getUid(userHandle, ps.appId), userHandle,
ps.pkg.applicationInfo.seinfo);
}
readDefaultPreferredAppsLPw(service, userHandle);
writePackageRestrictionsLPr(userHandle);